[arch-projects] [PATCH 0/3] whitespace/syntax Cleanup
Hey all, This is mostly just cleanup, with only one functional change in the first patch. If we want to adopt this change to /run, I'll submit a patch for mkinitcpio as well. regards, dave
We already have /tmp and /dev/shm as world writeable directories with exec permissions, so it doesn't necessarily make sense to inhibit exec here. There also might be use cases where running one-off programs from /run might make sense. Signed-off-by: Dave Reisner <d@falconindy.com> --- rc.sysinit | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rc.sysinit b/rc.sysinit index c87e3dc..070d29e 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -19,7 +19,7 @@ export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" # mount /proc, /sys, /run, /dev, /run/lock, /dev/pts, /dev/shm (the api filesystems) /bin/mountpoint -q /proc || /bin/mount -n -t proc proc /proc -o nosuid,noexec,nodev /bin/mountpoint -q /sys || /bin/mount -n -t sysfs sysfs /sys -o nosuid,noexec,nodev -/bin/mountpoint -q /run || /bin/mount -n -t tmpfs tmpfs /run -o mode=755,size=10M,nosuid,noexec,nodev +/bin/mountpoint -q /run || /bin/mount -n -t tmpfs tmpfs /run -o mode=755,size=10M,nosuid,nodev if ! /bin/mountpoint -q /dev; then if /bin/grep -q devtmpfs /proc/filesystems &>/dev/null; then /bin/mount -n -t devtmpfs udev /dev -o mode=0755,size=10M,nosuid -- 1.7.5.2
ACK. However, we should coordinate with mkinitcpio. On Thu, Jun 2, 2011 at 4:33 PM, Dave Reisner <d@falconindy.com> wrote:
We already have /tmp and /dev/shm as world writeable directories with exec permissions, so it doesn't necessarily make sense to inhibit exec here. There also might be use cases where running one-off programs from /run might make sense.
Signed-off-by: Dave Reisner <d@falconindy.com> --- rc.sysinit | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/rc.sysinit b/rc.sysinit index c87e3dc..070d29e 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -19,7 +19,7 @@ export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" # mount /proc, /sys, /run, /dev, /run/lock, /dev/pts, /dev/shm (the api filesystems) /bin/mountpoint -q /proc || /bin/mount -n -t proc proc /proc -o nosuid,noexec,nodev /bin/mountpoint -q /sys || /bin/mount -n -t sysfs sysfs /sys -o nosuid,noexec,nodev -/bin/mountpoint -q /run || /bin/mount -n -t tmpfs tmpfs /run -o mode=755,size=10M,nosuid,noexec,nodev +/bin/mountpoint -q /run || /bin/mount -n -t tmpfs tmpfs /run -o mode=755,size=10M,nosuid,nodev if ! /bin/mountpoint -q /dev; then if /bin/grep -q devtmpfs /proc/filesystems &>/dev/null; then /bin/mount -n -t devtmpfs udev /dev -o mode=0755,size=10M,nosuid -- 1.7.5.2
Signed-off-by: Dave Reisner <d@falconindy.com> --- rc.d | 4 ++-- rc.sysinit | 23 ++++++++++++----------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/rc.d b/rc.d index 772f2c6..f0c5204 100755 --- a/rc.d +++ b/rc.d @@ -56,9 +56,9 @@ case $1 in cd / for i; do if [[ -x "/etc/rc.d/$i" ]]; then - /usr/bin/env -i "${ENV[@]}" "/etc/rc.d/$i" "$action" + /usr/bin/env -i "${ENV[@]}" "/etc/rc.d/$i" "$action" else - printf "${C_OTHER}:: ${C_FAIL}Error: ${C_DONE}Daemon script $i does not exist.\n" + printf "${C_OTHER}:: ${C_FAIL}Error: ${C_DONE}Daemon script $i does not exist.\n" fi (( ret += !! $? )) # clamp exit value to 0/1 done diff --git a/rc.sysinit b/rc.sysinit index 070d29e..dbc15ba 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -36,8 +36,8 @@ fi # remount root ro to allow for fsck later on, we remount now to # make sure nothing can open files rw on root which would block a remount -/bin/findmnt / --options ro &>/dev/null || \ -status "Mounting Root Read-Only" /bin/mount -n -o remount,ro / +/bin/findmnt / --options ro &>/dev/null || + status "Mounting Root Read-Only" /bin/mount -n -o remount,ro / # start up our mini logger until syslog takes over /sbin/minilogd @@ -45,8 +45,8 @@ status "Mounting Root Read-Only" /bin/mount -n -o remount,ro / # Set console verbosity for cmdarg in $(< /proc/cmdline); do - [[ "$cmdarg" == verbose ]] && VERBOSE=8 && break - [[ "$cmdarg" =~ verbose=[1-8] ]] && VERBOSE=${BASH_REMATCH[0]-8} && break + [[ "$cmdarg" == verbose ]] && VERBOSE=8 && break + [[ "$cmdarg" =~ verbose=[1-8] ]] && VERBOSE=${BASH_REMATCH[0]-8} && break done /bin/dmesg -n ${VERBOSE:-3} @@ -111,8 +111,8 @@ fi run_hook sysinit_udevsettled # bring up the loopback interface -[[ -d /sys/class/net/lo ]] && \ - status "Bringing up loopback interface" /usr/sbin/ip link set up dev lo +[[ -d /sys/class/net/lo ]] && + status "Bringing up loopback interface" /usr/sbin/ip link set up dev lo # FakeRAID devices detection if [[ $USEDMRAID =~ yes|YES && -x /sbin/dmraid ]]; then @@ -317,8 +317,9 @@ stat_busy "Removing Leftover Files" /bin/rm -rf /tmp/* /tmp/.* &>/dev/null [[ ! -L /var/lock ]] && /bin/rm -rf /var/lock/* [[ ! -L /var/run && -d /var/run ]] && /usr/bin/find /var/run/ \! -type d -delete - [[ ! -L /var/run && ! -L /var/run/daemons ]] && /bin/rm -rf /var/run/daemons \ - && /bin/ln -s /run/daemons /var/run/daemons + [[ ! -L /var/run && ! -L /var/run/daemons ]] && + /bin/rm -rf /var/run/daemons && + /bin/ln -s /run/daemons /var/run/daemons : >| /var/run/utmp /bin/chmod 0664 /var/run/utmp /bin/chown root:utmp /var/run/utmp @@ -369,9 +370,9 @@ set_consolefont # When the rules are generated before /etc is mounted rw they are saved to /run, # we therefore need to copy this from /run to /etc. This functionality is going away one day. for f in cd net; do - [[ -f /run/udev/tmp-rules--70-persistent-$f.rules ]] || continue - status "Adding persistent $f udev rules" \ - /bin/cat "/run/udev/tmp-rules--70-persistent-$f.rules" >> "/etc/udev/rules.d/70-persistent-$f.rules" + [[ -f /run/udev/tmp-rules--70-persistent-$f.rules ]] || continue + status "Adding persistent $f udev rules" \ + /bin/cat "/run/udev/tmp-rules--70-persistent-$f.rules" >> "/etc/udev/rules.d/70-persistent-$f.rules" done /bin/dmesg >| /var/log/dmesg.log -- 1.7.5.2
Signed-off-by: Dave Reisner <d@falconindy.com> --- rc.multi | 2 +- rc.single | 2 +- rc.sysinit | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rc.multi b/rc.multi index d8bf126..60bb835 100755 --- a/rc.multi +++ b/rc.multi @@ -27,7 +27,7 @@ fi run_hook multi_end /bin/touch /var/log/boot -kill `/bin/cat /run/bootlogd.pid` +kill $(/bin/cat /run/bootlogd.pid) /bin/rm /run/bootlogd.pid # vim: set ts=2 sw=2 noet: diff --git a/rc.single b/rc.single index d1191d2..92b8f53 100755 --- a/rc.single +++ b/rc.single @@ -49,7 +49,7 @@ if [[ $RUNLEVEL = 1 ]]; then fi /bin/touch /var/log/boot -kill `/bin/cat /run/bootlogd.pid` +kill $(/bin/cat /run/bootlogd.pid) /bin/rm /run/bootlogd.pid # End of file diff --git a/rc.sysinit b/rc.sysinit index dbc15ba..629d9a5 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -194,7 +194,7 @@ if [[ -f /etc/crypttab && -n $CS ]] && /bin/grep -q ^[^#] /etc/crypttab; then /bin/dd if=${ckdev} of=${ckfile} bs=1 skip=${cka} count=${ckb} >/dev/null 2>&1;; esac $CS -d ${ckfile} $4 $open "$a" "$b" >/dev/null - /bin/dd if=/dev/urandom of=${ckfile} bs=1 count=`stat -c %s ${ckfile}` conv=notrunc >/dev/null 2>&1 + /bin/dd if=/dev/urandom of=${ckfile} bs=1 count=$(stat -c %s ${ckfile}) conv=notrunc >/dev/null 2>&1 rm ${ckfile};; /*) $CS -d "$3" $4 $open "$a" "$b" >/dev/null;; -- 1.7.5.2
On Thu, Jun 2, 2011 at 4:33 PM, Dave Reisner <d@falconindy.com> wrote:
Hey all,
This is mostly just cleanup, with only one functional change in the first patch. If we want to adopt this change to /run, I'll submit a patch for mkinitcpio as well.
Hehe, maybe I should read your emails in the right order :-) Point is; I agree. -t
participants (2)
-
Dave Reisner
-
Tom Gundersen