mkdir always with -m 0755

master
Harald Hoyer 2011-04-06 09:22:21 +02:00
parent 8daaa46478
commit d125a47061
14 changed files with 29 additions and 28 deletions

View File

@ -33,7 +33,7 @@ do_fipskernel()


[ -e "$boot" ] [ -e "$boot" ]


mkdir /boot mkdir -m 0755 /boot
info "Mounting $boot as /boot" info "Mounting $boot as /boot"
mount -oro "$boot" /boot mount -oro "$boot" /boot



View File

@ -15,7 +15,7 @@ installkernel() {
FIPSMODULES="$FIPSMODULES des deflate ecb eseqiv hmac seqiv sha256 sha512" FIPSMODULES="$FIPSMODULES des deflate ecb eseqiv hmac seqiv sha256 sha512"
FIPSMODULES="$FIPSMODULES cryptomgr crypto_null tcrypt" FIPSMODULES="$FIPSMODULES cryptomgr crypto_null tcrypt"


mkdir -p "${initdir}/etc/modprobe.d" mkdir -m 0755 -p "${initdir}/etc/modprobe.d"


for mod in $FIPSMODULES; do for mod in $FIPSMODULES; do
if instmods $mod; then if instmods $mod; then

View File

@ -17,7 +17,7 @@ install() {
else else
if rpm -qf $(type -P $0) &>/dev/null; then if rpm -qf $(type -P $0) &>/dev/null; then
dracut_rpm_version=$(rpm -qf --qf '%{name}-%{version}-%{release}\n' $(type -P $0) | { ver="";while read line;do ver=$line;done;echo $ver;} ) dracut_rpm_version=$(rpm -qf --qf '%{name}-%{version}-%{release}\n' $(type -P $0) | { ver="";while read line;do ver=$line;done;echo $ver;} )
mkdir -m 0755 -p $initdir/lib $initdir/lib/dracut mkdir -m 0755 -p $initdir/lib/dracut
echo $dracut_rpm_version > $initdir/lib/dracut/$dracut_rpm_version echo $dracut_rpm_version > $initdir/lib/dracut/$dracut_rpm_version
fi fi
fi fi

View File

@ -17,7 +17,7 @@ if [ -e /tmp/bridge.info ]; then
. /tmp/bridge.info . /tmp/bridge.info
fi fi


mkdir -p /tmp/ifcfg/ mkdir -m 0755 -p /tmp/ifcfg/


for netif in $IFACES ; do for netif in $IFACES ; do
# bridge? # bridge?
@ -134,9 +134,9 @@ for netif in $IFACES ; do
done done


# Pass network opts # Pass network opts
mkdir -p /run/initramfs mkdir -m 0755 -p /run/initramfs
cp /tmp/net.* /run/initramfs/ >/dev/null 2>&1 cp /tmp/net.* /run/initramfs/ >/dev/null 2>&1
mkdir -p /run/initramfs/state/etc/sysconfig/network-scripts/ mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts/
cp /tmp/net.$netif.resolv.conf /run/initramfs/state/etc/ >/dev/null 2>&1 cp /tmp/net.$netif.resolv.conf /run/initramfs/state/etc/ >/dev/null 2>&1
echo "files /etc/sysconfig/network-scripts" > /run/initramfs/rwtab echo "files /etc/sysconfig/network-scripts" > /run/initramfs/rwtab
cp -a /tmp/ifcfg/* /run/initramfs/state/etc/sysconfig/network-scripts/ >/dev/null 2>&1 cp -a /tmp/ifcfg/* /run/initramfs/state/etc/sysconfig/network-scripts/ >/dev/null 2>&1

View File

@ -9,7 +9,7 @@ dracut_install /bin/plymouth \
"${PLYMOUTH_LOGO_FILE}" \ "${PLYMOUTH_LOGO_FILE}" \
/etc/system-release /etc/system-release


mkdir -p "${initdir}/usr/share/plymouth" mkdir -m 0755 -p "${initdir}/usr/share/plymouth"


if [[ $hostonly ]]; then if [[ $hostonly ]]; then
dracut_install "${usrlibdir}/plymouth/text.so" \ dracut_install "${usrlibdir}/plymouth/text.so" \
@ -34,7 +34,7 @@ else
for x in /usr/share/plymouth/themes/{text,details}/* ; do for x in /usr/share/plymouth/themes/{text,details}/* ; do
[[ -f "$x" ]] || continue [[ -f "$x" ]] || continue
THEME_DIR=$(dirname "$x") THEME_DIR=$(dirname "$x")
mkdir -p "${initdir}/$THEME_DIR" mkdir -m 0755 -p "${initdir}/$THEME_DIR"
dracut_install "$x" dracut_install "$x"
done done
for x in "${usrlibdir}"/plymouth/{text,details}.so ; do for x in "${usrlibdir}"/plymouth/{text,details}.so ; do

View File

@ -17,7 +17,7 @@ if getargbool 1 rd.plymouth -n rd_NO_PLYMOUTH; then
[ -e /dev/fb ] || ln -s fb0 /dev/fb [ -e /dev/fb ] || ln -s fb0 /dev/fb


info "Starting plymouth daemon" info "Starting plymouth daemon"
mkdir -m 0755 -p /run/plymouth mkdir -m 0755 /run/plymouth
[ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session --pid-file /run/plymouth/pid [ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session --pid-file /run/plymouth/pid
[ -x /lib/udev/console_init ] && /lib/udev/console_init tty0 [ -x /lib/udev/console_init ] && /lib/udev/console_init tty0
/bin/plymouth --show-splash 2>&1 | vinfo /bin/plymouth --show-splash 2>&1 | vinfo

View File

@ -43,7 +43,7 @@ getarg ro && liverw=ro
getarg rw && liverw=rw getarg rw && liverw=rw
[ -z "$liverw" ] && liverw=ro [ -z "$liverw" ] && liverw=ro
# mount the backing of the live image first # mount the backing of the live image first
mkdir -p /run/initramfs/live mkdir -m 0755 -p /run/initramfs/live
if [ -f $livedev ]; then if [ -f $livedev ]; then
# no mount needed - we've already got the LiveOS image in initramfs # no mount needed - we've already got the LiveOS image in initramfs
case $livedev in case $livedev in
@ -84,7 +84,7 @@ do_live_overlay() {
# need to know where to look for the overlay # need to know where to look for the overlay
setup="" setup=""
if [ -n "$devspec" -a -n "$pathspec" -a -n "$overlay" ]; then if [ -n "$devspec" -a -n "$pathspec" -a -n "$overlay" ]; then
mkdir /overlayfs mkdir -m 0755 /run/initramfs/overlayfs
mount -n -t auto $devspec /overlayfs || : mount -n -t auto $devspec /overlayfs || :
if [ -f /overlayfs$pathspec -a -w /overlayfs$pathspec ]; then if [ -f /overlayfs$pathspec -a -w /overlayfs$pathspec ]; then
losetup $OVERLAY_LOOPDEV /overlayfs$pathspec losetup $OVERLAY_LOOPDEV /overlayfs$pathspec
@ -93,7 +93,7 @@ do_live_overlay() {
fi fi
setup="yes" setup="yes"
fi fi
umount -l /overlayfs || : umount -l /run/initramfs/overlayfs || :
fi fi


if [ -z "$setup" ]; then if [ -z "$setup" ]; then
@ -125,11 +125,11 @@ if [ -n "$OSMINSQFS" ]; then
dd if=$OSMINSQFS of=/osmin.img 2> /dev/null dd if=$OSMINSQFS of=/osmin.img 2> /dev/null
OSMIN_SQUASHED_LOOPDEV=$( losetup -f ) OSMIN_SQUASHED_LOOPDEV=$( losetup -f )
losetup -r $OSMIN_SQUASHED_LOOPDEV /osmin.img losetup -r $OSMIN_SQUASHED_LOOPDEV /osmin.img
mkdir -p /squashfs.osmin mkdir -m 0755 -p /run/initramfs/squashfs.osmin
mount -n -t squashfs -o ro $OSMIN_SQUASHED_LOOPDEV /squashfs.osmin mount -n -t squashfs -o ro $OSMIN_SQUASHED_LOOPDEV /run/initramfs/squashfs.osmin
OSMIN_LOOPDEV=$( losetup -f ) OSMIN_LOOPDEV=$( losetup -f )
losetup -r $OSMIN_LOOPDEV /squashfs.osmin/osmin losetup -r $OSMIN_LOOPDEV /run/initramfs/squashfs.osmin/osmin
umount -l /squashfs.osmin umount -l /run/initramfs/squashfs.osmin
fi fi


# we might have an embedded fs image to use as rootfs (uncompressed live) # we might have an embedded fs image to use as rootfs (uncompressed live)
@ -164,8 +164,8 @@ if [ -e "$SQUASHED" ] ; then


SQUASHED_LOOPDEV=$( losetup -f ) SQUASHED_LOOPDEV=$( losetup -f )
losetup -r $SQUASHED_LOOPDEV $SQUASHED losetup -r $SQUASHED_LOOPDEV $SQUASHED
mkdir -p /squashfs mkdir -m 0755 -p /run/initramfs/squashfs
mount -n -t squashfs -o ro $SQUASHED_LOOPDEV /squashfs mount -n -t squashfs -o ro $SQUASHED_LOOPDEV /run/initramfs/squashfs


BASE_LOOPDEV=$( losetup -f ) BASE_LOOPDEV=$( losetup -f )
if [ -f /squashfs/LiveOS/ext3fs.img ]; then if [ -f /squashfs/LiveOS/ext3fs.img ]; then

View File

@ -11,7 +11,7 @@ LVS=$(getargs rd.lvm.lv rd_LVM_LV=)
SNAPSHOT=$(getargs rd.lvm.snapshot rd_LVM_SNAPSHOT=) SNAPSHOT=$(getargs rd.lvm.snapshot rd_LVM_SNAPSHOT=)
SNAPSIZE=$(getargs rd.lvm.snapsize rd_LVM_SNAPSIZE=) SNAPSIZE=$(getargs rd.lvm.snapsize rd_LVM_SNAPSIZE=)


[ -d /etc/lvm ] || mkdir -p /etc/lvm [ -d /etc/lvm ] || mkdir -m 0755 -p /etc/lvm
# build a list of devices to scan # build a list of devices to scan
lvmdevs=$( lvmdevs=$(
for f in /tmp/.lvm_scan-*; do for f in /tmp/.lvm_scan-*; do

View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh # ex: ts=8 sw=4 sts=4 et filetype=sh
[ -d /etc/modprobe.d ] || mkdir /etc/modprobe.d [ -d /etc/modprobe.d ] || mkdir -m 0755 -p /etc/modprobe.d


dasd_arg=$(getarg rd.dasd_mod.dasd rd_DASD_MOD=) dasd_arg=$(getarg rd.dasd_mod.dasd rd_DASD_MOD=)
if [ -n "$dasd_arg" ]; then if [ -n "$dasd_arg" ]; then

View File

@ -26,7 +26,7 @@ install() {
inst fipvlan inst fipvlan
inst lldpad inst lldpad


mkdir -p "$initdir/var/lib/lldpad" mkdir -m 0755 -p "$initdir/var/lib/lldpad"


inst "$moddir/fcoe-up" "/sbin/fcoe-up" inst "$moddir/fcoe-up" "/sbin/fcoe-up"
inst "$moddir/fcoe-genrules.sh" "/sbin/fcoe-genrules.sh" inst "$moddir/fcoe-genrules.sh" "/sbin/fcoe-genrules.sh"

View File

@ -49,9 +49,9 @@ install() {
inst_hook cmdline 90 "$moddir/parse-nfsroot.sh" inst_hook cmdline 90 "$moddir/parse-nfsroot.sh"
inst_hook pre-pivot 99 "$moddir/nfsroot-cleanup.sh" inst_hook pre-pivot 99 "$moddir/nfsroot-cleanup.sh"
inst "$moddir/nfsroot" "/sbin/nfsroot" inst "$moddir/nfsroot" "/sbin/nfsroot"
mkdir -p "$initdir/var/lib/nfs/rpc_pipefs" mkdir -m 0755 -p "$initdir/var/lib/nfs/rpc_pipefs"
mkdir -p "$initdir/var/lib/rpcbind" mkdir -m 0755 -p "$initdir/var/lib/rpcbind"
mkdir -p "$initdir/var/lib/nfs/statd/sm" mkdir -m 0755 -p "$initdir/var/lib/nfs/statd/sm"


# Rather than copy the passwd file in, just set a user for rpcbind # Rather than copy the passwd file in, just set a user for rpcbind
# We'll save the state and restart the daemon from the root anyway # We'll save the state and restart the daemon from the root anyway

View File

@ -16,7 +16,8 @@ pid=$(pidof rpcbind)


if incol2 /proc/mounts /var/lib/nfs/rpc_pipefs; then if incol2 /proc/mounts /var/lib/nfs/rpc_pipefs; then
# try to create the destination directory # try to create the destination directory
[ -d $NEWROOT/$rpcpipefspath ] || mkdir -p $NEWROOT/$rpcpipefspath 2>/dev/null [ -d $NEWROOT/$rpcpipefspath ] || \
mkdir -m 0755 -p $NEWROOT/$rpcpipefspath 2>/dev/null


if [ -d $NEWROOT/$rpcpipefspath ]; then if [ -d $NEWROOT/$rpcpipefspath ]; then
mount --move /var/lib/nfs/rpc_pipefs $NEWROOT/$rpcpipefspath mount --move /var/lib/nfs/rpc_pipefs $NEWROOT/$rpcpipefspath

View File

@ -35,7 +35,7 @@ install() {
inst_hook pre-pivot 99 "$moddir/syslog-cleanup.sh" inst_hook pre-pivot 99 "$moddir/syslog-cleanup.sh"
inst_simple "$moddir/rsyslogd-start.sh" /sbin/rsyslogd-start inst_simple "$moddir/rsyslogd-start.sh" /sbin/rsyslogd-start
inst_simple "$moddir/rsyslogd-stop.sh" /sbin/rsyslogd-stop inst_simple "$moddir/rsyslogd-stop.sh" /sbin/rsyslogd-stop
mkdir -p ${initdir}/etc/templates mkdir -m 0755 -p ${initdir}/etc/templates
inst_simple "${moddir}/rsyslog.conf" /etc/templates inst_simple "${moddir}/rsyslog.conf" /etc/templates
fi fi
} }

View File

@ -453,10 +453,10 @@ mkuniqdir() {
local dir="$1"; local prefix="$2" local dir="$1"; local prefix="$2"
local retdir; local retdir_new local retdir; local retdir_new


[ -d "${dir}" ] || mkdir -p "${dir}" || return 1 [ -d "${dir}" ] || mkdir -m 0755 -p "${dir}" || return 1


retdir=$(funiq "${dir}" "${prefix}") || return 1 retdir=$(funiq "${dir}" "${prefix}") || return 1
until mkdir "${retdir}" 2>/dev/null; do until mkdir -m 0755 "${retdir}" 2>/dev/null; do
retdir_new=$(funiq "${dir}" "${prefix}") || return 1 retdir_new=$(funiq "${dir}" "${prefix}") || return 1
[ "$retdir_new" = "$retdir" ] && return 1 [ "$retdir_new" = "$retdir" ] && return 1
retdir="$retdir_new" retdir="$retdir_new"