From 5e868fdde66452c11453a207954e6864fdb255ba Mon Sep 17 00:00:00 2001 From: "Adrian C. (anrxc)" Date: Mon, 10 Jun 2013 13:29:15 +0200 Subject: initscripts: deprecate /sbin and /usr/sbin Arch Linux has unified /sbin and /usr/sbin into a single binaries directory: /usr/bin --- Makefile | 4 ++-- functions | 2 +- inittab | 22 +++++++++++----------- rc.d | 4 ++-- rc.shutdown | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 0519af7..af59be6 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ DIRS := \ /usr/lib/systemd/system/multi-user.target.wants \ /usr/lib/systemd/system/shutdown.target.wants \ /usr/lib/systemd/system/sysinit.target.wants \ - /usr/sbin \ + /usr/bin \ /usr/share/bash-completion/completions \ /usr/share/zsh/site-functions \ /usr/share/man/man5 \ @@ -26,7 +26,7 @@ install: installdirs doc install -m644 -t $(DESTDIR)/etc/logrotate.d bootlog install -m644 -t $(DESTDIR)/etc/rc.d functions install -m755 -t $(DESTDIR)/etc/rc.d hwclock network netfs - install -m755 -t $(DESTDIR)/usr/sbin rc.d + install -m755 -t $(DESTDIR)/usr/bin rc.d install -m644 -t $(DESTDIR)/usr/share/man/man5 rc.conf.5 install -m644 -t $(DESTDIR)/usr/share/man/man8 rc.d.8 arch-modules-load.8 arch-daemons.8 install -m755 -t $(DESTDIR)/usr/lib/systemd/system-generators arch-daemons diff --git a/functions b/functions index 16a6cd1..ea042f5 100644 --- a/functions +++ b/functions @@ -3,7 +3,7 @@ # # sanitize PATH (will be overridden later when /etc/profile is sourced but is useful for udev) -export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" +export PATH="/usr/local/bin:/usr/bin:/bin" # clear the TZ envvar, so daemons always respect /etc/localtime unset TZ diff --git a/inittab b/inittab index a375f59..bae447a 100644 --- a/inittab +++ b/inittab @@ -21,27 +21,27 @@ rc::sysinit:/etc/rc.sysinit rs:S1:wait:/etc/rc.single rm:2345:wait:/etc/rc.multi rh:06:wait:/etc/rc.shutdown -su:S:wait:/sbin/sulogin -p +su:S:wait:/usr/bin/sulogin -p # -8 options fixes umlauts problem on login -c1:2345:respawn:/sbin/agetty -8 -s 38400 tty1 linux -c2:2345:respawn:/sbin/agetty -8 -s 38400 tty2 linux -c3:2345:respawn:/sbin/agetty -8 -s 38400 tty3 linux -c4:2345:respawn:/sbin/agetty -8 -s 38400 tty4 linux -c5:2345:respawn:/sbin/agetty -8 -s 38400 tty5 linux -c6:2345:respawn:/sbin/agetty -8 -s 38400 tty6 linux +c1:2345:respawn:/usr/bin/agetty -8 -s 38400 tty1 linux +c2:2345:respawn:/usr/bin/agetty -8 -s 38400 tty2 linux +c3:2345:respawn:/usr/bin/agetty -8 -s 38400 tty3 linux +c4:2345:respawn:/usr/bin/agetty -8 -s 38400 tty4 linux +c5:2345:respawn:/usr/bin/agetty -8 -s 38400 tty5 linux +c6:2345:respawn:/usr/bin/agetty -8 -s 38400 tty6 linux # Serial Virtual Console for KVM and others VMs -#s0:2345:respawn:/sbin/agetty -8 -s 9600 ttyS0 linux +#s0:2345:respawn:/usr/bin/agetty -8 -s 9600 ttyS0 linux # Hypervisor Virtual Console for Xen and KVM -#h0:2345:respawn:/sbin/agetty -8 -s 38400 hvc0 linux +#h0:2345:respawn:/usr/bin/agetty -8 -s 38400 hvc0 linux -ca::ctrlaltdel:/sbin/shutdown -t3 -r now +ca::ctrlaltdel:/usr/bin/shutdown -t3 -r now # Example lines for starting a login manager x:5:respawn:/usr/bin/xdm -nodaemon -#x:5:respawn:/usr/sbin/gdm -nodaemon +#x:5:respawn:/usr/bin/gdm -nodaemon #x:5:respawn:/usr/bin/kdm -nodaemon #x:5:respawn:/usr/bin/slim >/dev/null 2>&1 diff --git a/rc.d b/rc.d index 77852d7..7175c46 100755 --- a/rc.d +++ b/rc.d @@ -115,8 +115,8 @@ case $action in [[ -z $daemons ]] && usage filter_daemons # set same environment variables as init - runlevel=$(/sbin/runlevel) - ENV=('PATH=/bin:/usr/bin:/sbin:/usr/sbin' + runlevel=$(/usr/bin/runlevel) + ENV=('PATH=/bin:/usr/bin' "PREVLEVEL=${runlevel%% *}" "RUNLEVEL=${runlevel##* }" "CONSOLE=${CONSOLE:-/dev/console}" diff --git a/rc.shutdown b/rc.shutdown index d569dd2..87b91b5 100755 --- a/rc.shutdown +++ b/rc.shutdown @@ -102,7 +102,7 @@ if [[ -x /run/initramfs/shutdown ]]; then pivot_root . oldroot # reexec init - /oldroot/sbin/init u + /oldroot/usr/bin/init u # run /shutdown in the new root exec chroot . /shutdown $action /dev/console 2>&1 -- cgit v1.2.3