diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rwxr-xr-x | adjtime | 15 | ||||
| -rwxr-xr-x | hwclock | 23 | ||||
| -rwxr-xr-x | network | 60 | ||||
| -rwxr-xr-x | rc.d | 2 | ||||
| -rwxr-xr-x | rc.shutdown | 42 | ||||
| -rwxr-xr-x | rc.single | 20 | ||||
| -rwxr-xr-x | rc.sysinit | 178 |
8 files changed, 154 insertions, 189 deletions
@@ -1,5 +1,5 @@ VER := $(shell git describe) -DIRS := /etc/rc.d /etc/conf.d /etc/rc.d/functions.d /etc/cron.hourly /sbin /etc/bash_completion.d /usr/share/zsh/site-functions +DIRS := /etc/rc.d /etc/conf.d /etc/rc.d/functions.d /sbin /etc/bash_completion.d /usr/share/zsh/site-functions minilogd: minilogd.o @@ -9,7 +9,6 @@ installdirs: install: minilogd installdirs install -m644 -t $(DESTDIR)/etc inittab rc.conf install -m755 -t $(DESTDIR)/etc rc.local rc.local.shutdown rc.multi rc.shutdown rc.single rc.sysinit - install -m755 -t $(DESTDIR)/etc/cron.hourly adjtime install -m644 -t $(DESTDIR)/etc/rc.d functions install -m755 -t $(DESTDIR)/etc/rc.d hwclock network netfs install -m755 -t $(DESTDIR)/sbin minilogd rc.d diff --git a/adjtime b/adjtime deleted file mode 100755 index 8a894f1..0000000 --- a/adjtime +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Update our hwclock for system drift - -. /etc/rc.conf - -HWCLOCK_PARAMS="--adjust" -case $HARDWARECLOCK in - UTC) HWCLOCK_PARAMS+=" --utc";; - localtime) HWCLOCK_PARAMS+=" --localtime";; - *) HWCLOCK_PARAMS="";; -esac - -if [[ $HWCLOCK_PARAMS && -f /run/daemons/hwclock ]]; then - /sbin/hwclock $HWCLOCK_PARAMS -fi @@ -11,27 +11,18 @@ esac case "$1" in start) - if [[ $HWCLOCK_PARAMS ]]; then - status "Adjusting Hardware Clock" \ - /sbin/hwclock --adjust - stat_busy "Setting System Clock" - /sbin/hwclock --hctosys $HWCLOCK_PARAMS || stat_die - stat_done - # Note: This also enables /etc/cron.hourly/adjtime - add_daemon hwclock - fi - ;; + add_daemon hwclock;; stop) - if [[ $HWCLOCK_PARAMS ]]; then - stat_busy "Saving System Clock" - /sbin/hwclock --systohc $HWCLOCK_PARAMS || stat_die - stat_done - fi + case $HARDWARECLOCK in + UTC) hwclock --adjust --utc;; + localtime) hwclock --adjust --localtime;; + "") hwclock --adjust;; + esac rm_daemon hwclock ;; restart) $0 stop - sleep 1 + sleep 2 $0 start ;; *) @@ -23,7 +23,7 @@ deprecated() { } network_up() { - /usr/sbin/ip link set dev $interface up || return 1 + ip link set dev $interface up || return 1 if [[ $address ]]; then for var in netmask gateway; do @@ -32,22 +32,22 @@ network_up() { return 1 fi done - /usr/sbin/ip addr add $address/$netmask dev $interface || return 1 - /usr/sbin/ip route add default via $gateway || return 1 + ip addr add $address/$netmask dev $interface || return 1 + ip route add default via $gateway || return 1 else - /sbin/dhcpcd $DHCPCD_ARGS $interface || return 1 + dhcpcd $DHCPCD_ARGS $interface || return 1 fi } network_down() { if [[ -f /var/run/dhcpcd-$interface.pid ]]; then - /sbin/dhcpcd -k $interface || return 1 + dhcpcd -k $interface || return 1 else - /usr/sbin/ip route del default || return 1 - /usr/sbin/ip addr flush dev $interface || return 1 + ip route del default || return 1 + ip addr flush dev $interface || return 1 fi - /usr/sbin/ip link set dev $interface down || return 1 + ip link set dev $interface down || return 1 } ifup() { @@ -65,17 +65,17 @@ ifup() { ifname=${ifcfg%% *} fi - /sbin/ifconfig $ifname up + ifconfig $ifname up wi_up $1 || return 1 if [[ $ifcfg = dhcp ]]; then # remove the .pid file if it exists - /bin/rm -f /var/run/dhcpcd-${1}.pid >/dev/null 2>&1 - /bin/rm -f /var/run/dhcpcd-${1}.cache >/dev/null 2>&1 - /sbin/dhcpcd $DHCPCD_ARGS ${1} + rm -f /var/run/dhcpcd-${1}.pid >/dev/null 2>&1 + rm -f /var/run/dhcpcd-${1}.cache >/dev/null 2>&1 + dhcpcd $DHCPCD_ARGS ${1} else - /sbin/ifconfig $ifcfg + ifconfig $ifcfg fi } @@ -84,7 +84,7 @@ wi_up() { [[ ${!iwcfg} ]] || return 0 - /usr/sbin/iwconfig ${!iwcfg} + iwconfig ${!iwcfg} [[ $WIRELESS_TIMEOUT ]] || WIRELESS_TIMEOUT=2 sleep $WIRELESS_TIMEOUT @@ -105,10 +105,10 @@ ifdown() { fi if [[ $ifcfg = dhcp && -f /var/run/dhcpcd-${1}.pid ]]; then - /sbin/dhcpcd -k ${1} >/dev/null 2>&1 + dhcpcd -k ${1} >/dev/null 2>&1 fi # Always bring the interface itself down - /sbin/ifconfig ${1} down >/dev/null 2>&1 + ifconfig ${1} down >/dev/null 2>&1 } iflist() { @@ -131,9 +131,9 @@ rtup() { fi if [[ $routecfg =~ :: ]]; then - /sbin/route -A inet6 add $routecfg + route -A inet6 add $routecfg else - /sbin/route add $routecfg + route add $routecfg fi } @@ -146,9 +146,9 @@ rtdown() { fi if [[ $routecfg =~ :: ]]; then - /sbin/route -A inet6 del $routecfg + route -A inet6 del $routecfg else - /sbin/route del $routecfg + route del $routecfg fi } @@ -168,7 +168,7 @@ bond_up() { if [[ $ifline = ${ifline#!} ]]; then bondcfg="bond_$ifline" if [[ ${!bondcfg} ]]; then - /sbin/ifenslave $ifline ${!bondcfg} || error=1 + ifenslave $ifline ${!bondcfg} || error=1 fi fi done @@ -178,7 +178,7 @@ bond_down() { for ifline in ${BOND_INTERFACES[@]}; do if [[ $ifline = ${ifline#!} ]]; then bondcfg="bond_$ifline" - /sbin/ifenslave -d $ifline ${!bondcfg} || error=1 + ifenslave -d $ifline ${!bondcfg} || error=1 fi done } @@ -187,11 +187,11 @@ bridge_up() { for br in ${BRIDGE_INTERFACES[@]}; do if [[ $br = ${br#!} ]]; then # if the bridge already exists, remove it - if [[ $(/sbin/ifconfig $br 2>/dev/null) ]]; then - /sbin/ifconfig $br down - /usr/sbin/brctl delbr $br + if [[ $(ifconfig $br 2>/dev/null) ]]; then + ifconfig $br down + brctl delbr $br fi - /usr/sbin/brctl addbr $br + brctl addbr $br brifs="bridge_$br" for brif in ${!brifs}; do if [[ $brif = ${brif#!} ]]; then @@ -199,12 +199,12 @@ bridge_up() { if [[ $brif = $ifline && $ifline = ${ifline#!} ]]; then ifup $ifline bondcfg="bond_$ifline" - /sbin/ifenslave $ifline ${!bondcfg} || error=1 + ifenslave $ifline ${!bondcfg} || error=1 unset bond_$ifline fi done - /usr/sbin/brctl addif $br $brif || error=1 + brctl addif $br $brif || error=1 fi done fi @@ -214,7 +214,7 @@ bridge_up() { bridge_down() { for br in ${BRIDGE_INTERFACES[@]}; do if [[ $br = ${br#!} ]]; then - /usr/sbin/brctl delbr $br + brctl delbr $br fi done } @@ -294,7 +294,7 @@ case "$1" in ;; restart) $0 stop - /bin/sleep 2 + sleep 2 $0 start ;; ifup|ifdown|iflist|rtup|rtdown|rtlist) @@ -56,7 +56,7 @@ case $1 in cd / for i; do if [[ -x "/etc/rc.d/$i" ]]; then - /usr/bin/env -i "${ENV[@]}" "/etc/rc.d/$i" "$action" + env -i "${ENV[@]}" "/etc/rc.d/$i" "$action" else printf "${C_OTHER}:: ${C_FAIL}Error: ${C_DONE}Daemon script $i does not exist.\n" fi diff --git a/rc.shutdown b/rc.shutdown index 604fdec..a040bbe 100755 --- a/rc.shutdown +++ b/rc.shutdown @@ -6,10 +6,12 @@ . /etc/rc.conf . /etc/rc.d/functions +export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" + run_hook shutdown_start # avoid staircase effect -/bin/stty onlcr +stty onlcr echo " " printhl "Initiating Shutdown..." @@ -23,49 +25,49 @@ stat_busy "Saving Random Seed" RANDOM_SEED=/var/lib/misc/random-seed [[ -d ${RANDOM_SEED%/*} ]] || mkdir -p ${RANDOM_SEED%/*} : > $RANDOM_SEED -/bin/chmod 0600 $RANDOM_SEED +chmod 0600 $RANDOM_SEED POOL_FILE=/proc/sys/kernel/random/poolsize if [[ -r $POOL_FILE ]]; then read POOL_SIZE <$POOL_FILE else POOL_SIZE=512 fi -/bin/dd if=/dev/urandom of=$RANDOM_SEED count=1 bs=$POOL_SIZE &> /dev/null +dd if=/dev/urandom of=$RANDOM_SEED count=1 bs=$POOL_SIZE &> /dev/null stat_done if [[ $TIMEZONE && -e /usr/share/zoneinfo/$TIMEZONE ]]; then - /bin/rm -f /etc/localtime + rm -f /etc/localtime status "Saving Time Zone" \ - /bin/cp "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime + cp "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime fi # Write to wtmp file before unmounting -/sbin/halt -w +halt -w -status "Deactivating Swap" /sbin/swapoff -a +status "Deactivating Swap" swapoff -a # stop monitoring of lvm2 groups before unmounting filesystems -if [[ $USELVM =~ yes|YES && -x /sbin/lvm && -d /sys/block ]]; then +if [[ $USELVM =~ yes|YES && -x $(type -P lvm) && -d /sys/block ]]; then status "Deactivating monitoring of LVM2 groups" \ - /sbin/vgchange --monitor n >/dev/null 2>&1 + vgchange --monitor n >/dev/null 2>&1 fi stat_busy "Unmounting Filesystems" -if /bin/grep -q devtmpfs /proc/filesystems &>/dev/null; then - /bin/umount -a -r -t nosysfs,noproc,nodevtmpfs,nodevpts -O no_netdev +if grep -q devtmpfs /proc/filesystems &>/dev/null; then + umount -a -r -t nosysfs,noproc,nodevtmpfs,nodevpts -O no_netdev else # if we don't have devtmpfs support, /dev is mounted as tmpfs, so don't unmount it - /bin/umount -a -r -t notmpfs,nosysfs,noproc,nodevpts -O no_netdev + umount -a -r -t notmpfs,nosysfs,noproc,nodevpts -O no_netdev fi stat_done # Kill non-root encrypted partition mappings -if [[ -f /etc/crypttab && -n $CS ]] && /bin/grep -q ^[^#] /etc/crypttab; then +if [[ -f /etc/crypttab && -n $CS ]] && grep -q ^[^#] /etc/crypttab; then stat_busy "Deactivating encrypted volumes:" # Maybe someone has LVM on an encrypted block device # executing an extra vgchange is errorless if [[ $USELVM =~ yes|YES ]]; then - /sbin/vgchange --sysinit -a n >/dev/null 2>&1 + vgchange --sysinit -a n >/dev/null 2>&1 fi do_lock() { stat_append "${1}.." @@ -79,11 +81,11 @@ if [[ -f /etc/crypttab && -n $CS ]] && /bin/grep -q ^[^#] /etc/crypttab; then stat_done fi -if [[ $USELVM =~ yes|YES && -x /sbin/lvm && -d /sys/block ]]; then - status "Deactivating LVM2 groups" /sbin/vgchange --sysinit -a n >/dev/null 2>&1 +if [[ $USELVM =~ yes|YES && -x $(type -P lvm) && -d /sys/block ]]; then + status "Deactivating LVM2 groups" vgchange --sysinit -a n >/dev/null 2>&1 fi -status "Remounting Root Filesystem Read-only" /bin/mount -n -o remount,ro / +status "Remounting Root Filesystem Read-only" mount -n -o remount,ro / run_hook shutdown_poweroff @@ -91,12 +93,12 @@ run_hook shutdown_poweroff printsep if [[ $RUNLEVEL = 0 ]]; then printhl "${C_H2}POWER OFF" - /sbin/poweroff -d -f -h -i + poweroff -d -f -h -i else printhl "${C_H2}REBOOTING" # if kexec is installed and a kernel is loaded, use it - [[ -x /sbin/kexec ]] && /sbin/kexec -e > /dev/null 2>&1 - /sbin/reboot -d -f -i + [[ -x $(type -P kexec) ]] && kexec -e > /dev/null 2>&1 + reboot -d -f -i fi # End of file @@ -6,25 +6,27 @@ . /etc/rc.conf . /etc/rc.d/functions +export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" + run_hook single_start if [[ $PREVLEVEL != N ]]; then kill_everything single - status "Starting UDev Daemon" /sbin/udevd --daemon + status "Starting UDev Daemon" udevd --daemon run_hook single_udevlaunched # Trigger udev uevents - if /bin/pidof -o %PPID /sbin/udevd >/dev/null; then + if pidof -o %PPID /udevd >/dev/null; then stat_busy "Triggering UDev uevents" - /sbin/udevadm trigger --action=add --type=subsystems - /sbin/udevadm trigger --action=add --type=devices + udevadm trigger --action=add --type=subsystems + udevadm trigger --action=add --type=devices stat_done fi # Wait for udev uevents - if /bin/pidof -o %PPID /sbin/udevd >/dev/null; then + if pidof -o %PPID udevd >/dev/null; then status "Waiting for UDev uevents to be processed" \ - /sbin/udevadm settle --quiet --timeout=${UDEV_TIMEOUT:-30} + udevadm settle --quiet --timeout=${UDEV_TIMEOUT:-30} fi run_hook single_udevsettled @@ -45,13 +47,13 @@ if [[ $RUNLEVEL = 1 ]]; then printhl "Entering single-user mode..." # make sure /dev/initctl is in place kill -HUP 1 - exec /sbin/init -t1 S + exec init -t1 S fi if [[ -f /run/bootlogd.pid ]]; then - /bin/touch /var/log/boot + touch /var/log/boot kill $(< /run/bootlogd.pid) - /bin/rm -f /run/bootlogd.pid + rm -f /run/bootlogd.pid fi # End of file @@ -17,53 +17,54 @@ run_hook sysinit_start 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 sys /sys -o nosuid,noexec,nodev -/bin/mountpoint -q /run || /bin/mount -n -t tmpfs run /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 +mountpoint -q /proc || mount -n -t proc proc /proc -o nosuid,noexec,nodev +mountpoint -q /sys || mount -n -t sysfs sys /sys -o nosuid,noexec,nodev +mountpoint -q /run || mount -n -t tmpfs run /run -o mode=755,size=10M,nosuid,nodev +if ! mountpoint -q /dev; then + if grep -q devtmpfs /proc/filesystems &>/dev/null; then + mount -n -t devtmpfs udev /dev -o mode=0755,size=10M,nosuid else - /bin/mount -n -t tmpfs udev /dev -o mode=0755,size=10M,nosuid + mount -n -t tmpfs udev /dev -o mode=0755,size=10M,nosuid fi fi -/bin/mkdir -p /run/lock /dev/{pts,shm} -/bin/chmod 1777 /run/lock -/bin/mountpoint -q /dev/pts || /bin/mount -n /dev/pts &> /dev/null \ - || /bin/mount -n -t devpts devpts /dev/pts -o mode=620,gid=5,nosuid,noexec -/bin/mountpoint -q /dev/shm || /bin/mount -n /dev/shm &> /dev/null \ - || /bin/mount -n -t tmpfs shm /dev/shm -o mode=1777,nosuid,nodev +mkdir -p /run/lock /dev/{pts,shm} +chmod 1777 /run/lock +mountpoint -q /dev/pts || mount -n /dev/pts &> /dev/null \ + || mount -n -t devpts devpts /dev/pts -o mode=620,gid=5,nosuid,noexec +mountpoint -q /dev/shm || mount -n /dev/shm &> /dev/null \ + || mount -n -t tmpfs shm /dev/shm -o mode=1777,nosuid,nodev # 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 / +findmnt / --options ro &>/dev/null || + status "Mounting Root Read-Only" mount -n -o remount,ro / # start up our mini logger until syslog takes over -/sbin/minilogd -/sbin/bootlogd -p /run/bootlogd.pid +minilogd +bootlogd -p /run/bootlogd.pid -HWCLOCK_PARAMS="--hctosys" +HWCLOCK_PARAMS="--systz" case $HARDWARECLOCK in - UTC) HWCLOCK_PARAMS+=" --utc";; - localtime) HWCLOCK_PARAMS+=" --localtime";; + "") ;; + UTC) HWCLOCK_PARAMS+=" --utc --noadjfile";; + localtime) HWCLOCK_PARAMS+=" --localtime --noadjfile";; *) HWCLOCK_PARAMS="";; esac if [[ $HWCLOCK_PARAMS ]]; then # enable rtc access - /sbin/modprobe -q -a rtc-cmos rtc genrtc + modprobe -q -a rtc-cmos rtc genrtc # If devtmpfs is used, the required RTC device already exists now # Otherwise, create whatever device is available if ! [[ -c /dev/rtc || -c /dev/rtc0 ]]; then for dev in /sys/class/rtc/rtc0/dev /sys/class/misc/rtc/dev; do [[ -e $dev ]] || continue IFS=: read -r major minor < "$dev" - /bin/mknod /dev/rtc c $major $minor + mknod /dev/rtc c $major $minor done fi - # Do a clock set here for a few reasons: + # Adjust the system time for timezone offset if rtc is not in UTC # 1. Make creation time on udev nodes sane (FS#8665) # 2. Filesystem checks can depend on system time # 3. This will set the clock, if using non-UTC, off the last known @@ -72,56 +73,50 @@ if [[ $HWCLOCK_PARAMS ]]; then # This does *NOT* take into account a time adjustment file as /var may not be # mounted yet. A second set may occur in rc.d/hwclock to match rc.conf. if [[ -f /etc/localtime ]]; then - /sbin/hwclock $HWCLOCK_PARAMS --noadjfile + hwclock $HWCLOCK_PARAMS fi fi -status "Starting UDev Daemon" /sbin/udevd --daemon +status "Starting UDev Daemon" udevd --daemon run_hook sysinit_udevlaunched -# Trigger udev uevents -if /bin/pidof /sbin/udevd &>/dev/null; then - stat_busy "Triggering UDev uevents" - /sbin/udevadm trigger --action=add --type=subsystems - /sbin/udevadm trigger --action=add --type=devices - stat_done -fi +stat_busy "Triggering UDev uevents" + udevadm trigger --action=add --type=subsystems + udevadm trigger --action=add --type=devices +stat_done # Load modules from the MODULES array defined in rc.conf mods=${MODULES[@]/!*/} if [[ $load_modules != off && -f /proc/modules && $mods ]]; then - status "Loading Modules" /sbin/modprobe --all $mods + status "Loading Modules" modprobe --all $mods fi unset mods -# Wait for udev uevents -if /bin/pidof /sbin/udevd &>/dev/null; then - status "Waiting for UDev uevents to be processed" \ - /sbin/udevadm settle --quiet --timeout=${UDEV_TIMEOUT:-30} -fi +status "Waiting for UDev uevents to be processed" \ + udevadm settle --timeout=${UDEV_TIMEOUT:-30} run_hook sysinit_udevsettled # bring up the loopback interface [[ -d /sys/class/net/lo ]] && - status "Bringing up loopback interface" /sbin/ip link set up dev lo + status "Bringing up loopback interface" ip link set up dev lo # FakeRAID devices detection -if [[ $USEDMRAID =~ yes|YES && -x /sbin/dmraid ]]; then - status "Activating FakeRAID arrays" /sbin/dmraid -i -ay +if [[ $USEDMRAID =~ yes|YES && -x $(type -P dmraid) ]]; then + status "Activating FakeRAID arrays" dmraid -i -ay fi # BTRFS devices detection -if [[ $USEBTRFS =~ yes|YES && -x /sbin/btrfs ]]; then - status "Activating BTRFS volumes" /sbin/btrfs device scan +if [[ $USEBTRFS =~ yes|YES && -x $(type -P btrfs) ]]; then + status "Activating BTRFS volumes" btrfs device scan fi activate_vgs # Set up non-root encrypted partition mappings -if [[ -f /etc/crypttab && -n $CS ]] && /bin/grep -q ^[^#] /etc/crypttab; then - /sbin/modprobe -q dm-crypt 2>/dev/null +if [[ -f /etc/crypttab && -n $CS ]] && grep -q ^[^#] /etc/crypttab; then + modprobe -q dm-crypt 2>/dev/null stat_busy "Unlocking encrypted volumes:" do_unlock() { # $1 = requested name @@ -151,7 +146,7 @@ if [[ -f /etc/crypttab && -n $CS ]] && /bin/grep -q ^[^#] /etc/crypttab; then # # This sanity check _should_ be sufficient, but it might not. # This may cause dataloss if it is not used carefully. - /sbin/blkid -p "$2" &>/dev/null + blkid -p "$2" &>/dev/null if [[ $? -eq 2 ]]; then _overwriteokay=1 fi @@ -160,7 +155,7 @@ if [[ -f /etc/crypttab && -n $CS ]] && /bin/grep -q ^[^#] /etc/crypttab; then false elif $CS -d /dev/urandom $4 $open "$a" "$b" >/dev/null; then stat_append "creating swapspace.." - /sbin/mkswap -f -L $1 /dev/mapper/$1 >/dev/null + mkswap -f -L $1 /dev/mapper/$1 >/dev/null fi;; ASK) printf "\nOpening '$1' volume:\n" @@ -176,18 +171,18 @@ if [[ -f /etc/crypttab && -n $CS ]] && /bin/grep -q ^[^#] /etc/crypttab; then *[!0-9]*) # Use a file on the device # cka is not numeric: cka=filesystem, ckb=path - /bin/mkdir ${ckdir} - /bin/mount -r -t ${cka} ${ckdev} ${ckdir} - /bin/dd if=${ckdir}/${ckb} of=${ckfile} >/dev/null 2>&1 - /bin/umount ${ckdir} - /bin/rmdir ${ckdir};; + mkdir ${ckdir} + mount -r -t ${cka} ${ckdev} ${ckdir} + dd if=${ckdir}/${ckb} of=${ckfile} >/dev/null 2>&1 + umount ${ckdir} + rmdir ${ckdir};; *) # Read raw data from the block device # cka is numeric: cka=offset, ckb=length - /bin/dd if=${ckdev} of=${ckfile} bs=1 skip=${cka} count=${ckb} >/dev/null 2>&1;; + 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 + 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;; @@ -216,13 +211,13 @@ fi NETFS="nonfs,nonfs4,nosmbfs,nocifs,nocodafs,noncpfs,nosysfs,noshfs,nofuse,nofuseblk,noglusterfs,nodavfs" -if [[ -x /sbin/fsck ]]; then +if [[ -x $(type -P fsck) ]]; then stat_busy "Checking Filesystems" fsck_reboot() { echo "Automatic reboot in progress..." - /bin/umount -a - /bin/mount -n -o remount,ro / - /sbin/reboot -f + umount -a + mount -n -o remount,ro / + reboot -f exit 0 } FSCK_OUT=/dev/stdout @@ -234,7 +229,7 @@ if [[ -x /sbin/fsck ]]; then [[ "$cmdarg" == forcefsck ]] && FORCEFSCK="-- -f" && break done run_hook sysinit_prefsck - /sbin/fsck -A -T -C$FSCK_FD -a -t "$NETFS,noopts=_netdev" $FORCEFSCK >$FSCK_OUT 2>$FSCK_ERR + fsck -A -T -C$FSCK_FD -a -t "$NETFS,noopts=_netdev" $FORCEFSCK >$FSCK_OUT 2>$FSCK_ERR fsckret=$? if ((fsckret > 1)); then stat_fail @@ -248,7 +243,7 @@ if [[ -x /sbin/fsck ]]; then echo "* *" echo "************************************************************" echo - /bin/sleep 15 + sleep 15 fsck_reboot elif ((fsckret > 1 && fsckret != 32)); then echo @@ -262,72 +257,72 @@ if [[ -x /sbin/fsck ]]; then echo "* *" echo "************************************************************" echo - /sbin/sulogin -p + sulogin -p fsck_reboot fi stat_done fi stat_busy "Mounting Local Filesystems" - /bin/mount -n -o remount,rw / + mount -n -o remount,rw / # don't touch /etc/mtab if it is a symlink to /proc/self/mounts if [[ -L /etc/mtab ]]; then : - elif [[ -x /bin/findmnt && -e /proc/self/mountinfo ]]; then - /bin/findmnt -rnu -o SOURCE,TARGET,FSTYPE,OPTIONS >| /etc/mtab + elif [[ -x $(type -P findmnt) && -e /proc/self/mountinfo ]]; then + findmnt -rnu -o SOURCE,TARGET,FSTYPE,OPTIONS >| /etc/mtab else cat /proc/mounts >| /etc/mtab fi run_hook sysinit_premount # now mount all the local filesystems - /bin/mount -a -t $NETFS -O no_netdev + mount -a -t $NETFS -O no_netdev stat_done # enable monitoring of lvm2 groups, now that the filesystems are mounted rw -if [[ $USELVM =~ yes|YES && -x /sbin/lvm && -d /sys/block ]]; then +if [[ $USELVM =~ yes|YES && -x $(type -P lvm) && -d /sys/block ]]; then status "Activating monitoring of LVM2 groups" \ - /sbin/vgchange --monitor y >/dev/null + vgchange --monitor y >/dev/null fi -status "Activating Swap" /sbin/swapon -a +status "Activating Swap" swapon -a if [[ $TIMEZONE && -e /usr/share/zoneinfo/$TIMEZONE ]]; then - /bin/rm -f /etc/localtime + rm -f /etc/localtime status "Configuring Time Zone" \ - /bin/cp "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime + cp "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime fi RANDOM_SEED=/var/lib/misc/random-seed if [[ -f $RANDOM_SEED ]]; then status "Initializing Random Seed" \ - /bin/cat $RANDOM_SEED > /dev/urandom + cat $RANDOM_SEED > /dev/urandom fi stat_busy "Removing Leftover Files" - /bin/rm -rf /etc/{nologin,shutdownpid} /forcefsck &>/dev/null - /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 + rm -rf /etc/{nologin,shutdownpid} /forcefsck &>/dev/null + rm -rf /tmp/* /tmp/.* &>/dev/null + [[ ! -L /var/lock ]] && rm -rf /var/lock/* + [[ ! -L /var/run && -d /var/run ]] && 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 + rm -rf /var/run/daemons && + ln -s /run/daemons /var/run/daemons : >| /var/run/utmp - /bin/chmod 0664 /var/run/utmp - /bin/chown root:utmp /var/run/utmp + chmod 0664 /var/run/utmp + chown root:utmp /var/run/utmp # Keep {x,k,g}dm happy with xorg - /bin/mkdir -m1777 /tmp/.{X11,ICE}-unix + mkdir -m1777 /tmp/.{X11,ICE}-unix stat_done if [[ $HOSTNAME ]]; then - status "Setting Hostname: $HOSTNAME" /bin/hostname "$HOSTNAME" + status "Setting Hostname: $HOSTNAME" hostname "$HOSTNAME" fi stat_busy "Setting Locale: ${LOCALE:=en_US}" # Flush old locale settings : >| /etc/profile.d/locale.sh - /bin/chmod 755 /etc/profile.d/locale.sh + chmod 755 /etc/profile.d/locale.sh # Set user defined locale echo "export LANG=$LOCALE" >>/etc/profile.d/locale.sh stat_done @@ -338,36 +333,27 @@ if [[ ${LOCALE,,} =~ utf ]]; then # this code is needed not only for older kernels, # but also when user has set vt.default_utf8=0 but LOCALE is *.UTF-8. for i in /dev/tty[0-9]*; do - /usr/bin/kbd_mode -u < ${i} + kbd_mode -u < ${i} printf "\e%%G" > ${i} done echo 1 > /sys/module/vt/parameters/default_utf8 stat_done - [[ $KEYMAP ]] && status "Loading Keyboard Map: $KEYMAP" /bin/loadkeys -q -u $KEYMAP + [[ $KEYMAP ]] && status "Loading Keyboard Map: $KEYMAP" loadkeys -q -u $KEYMAP else stat_busy "Setting Consoles to legacy mode" # make non-UTF-8 consoles work on 2.6.24 and newer kernels for i in /dev/tty[0-9]*; do - /usr/bin/kbd_mode -a < ${i} + kbd_mode -a < ${i} printf "\e%%@" > ${i} done echo 0 > /sys/module/vt/parameters/default_utf8 stat_done - [[ $KEYMAP ]] && status "Loading Keyboard Map: $KEYMAP" /bin/loadkeys -q $KEYMAP + [[ $KEYMAP ]] && status "Loading Keyboard Map: $KEYMAP" loadkeys -q $KEYMAP fi # Set console font if required set_consolefont -# Adding persistent network/cdrom generated rules -# 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" -done - if [[ -e /proc/sys/kernel/dmesg_restrict && $(< /proc/sys/kernel/dmesg_restrict) -eq 1 ]]; then : >| /var/log/dmesg.log chmod 600 /var/log/dmesg.log @@ -375,7 +361,7 @@ else : >| /var/log/dmesg.log chmod 644 /var/log/dmesg.log fi -/bin/dmesg >| /var/log/dmesg.log +dmesg >| /var/log/dmesg.log run_hook sysinit_end |