diff options
Diffstat (limited to 'source/a')
-rw-r--r-- | source/a/sysvinit-scripts/scripts/rc.M | 2 | ||||
-rw-r--r-- | source/a/sysvinit-scripts/scripts/rc.S | 13 | ||||
-rwxr-xr-x | source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild | 2 | ||||
-rw-r--r-- | source/a/util-linux/doinst.sh | 3 | ||||
-rw-r--r-- | source/a/util-linux/su.default | 3 | ||||
-rwxr-xr-x | source/a/util-linux/util-linux.SlackBuild | 7 |
6 files changed, 22 insertions, 8 deletions
diff --git a/source/a/sysvinit-scripts/scripts/rc.M b/source/a/sysvinit-scripts/scripts/rc.M index cfffb8ec..c0424ebe 100644 --- a/source/a/sysvinit-scripts/scripts/rc.M +++ b/source/a/sysvinit-scripts/scripts/rc.M @@ -75,7 +75,7 @@ if [ -x /etc/rc.d/rc.pcmcia ]; then fi # Start the system logger. -if [ -x /etc/rc.d/rc.syslog -a -x /usr/sbin/syslogd -a -d /var/log ]; then +if [ -x /etc/rc.d/rc.syslog ]; then /etc/rc.d/rc.syslog start fi diff --git a/source/a/sysvinit-scripts/scripts/rc.S b/source/a/sysvinit-scripts/scripts/rc.S index 4162938f..eb1765e1 100644 --- a/source/a/sysvinit-scripts/scripts/rc.S +++ b/source/a/sysvinit-scripts/scripts/rc.S @@ -367,6 +367,11 @@ else /sbin/mount -a -v -t nonfs,nosmbfs,nocifs,noproc,nosysfs | grep successfully | cut -f 1 -d : | tr -d ' ' | while read dev ; do mount | grep " ${dev} " ; done fi +# This should be empty as it's just a mountpoint now: +rm -rf /var/run/* +# Bind mount /run to /var/run: +mount -o bind /run /var/run + # Enable swapping again. This is needed in case a swapfile is used, # as it can't be enabled until the filesystem it resides on has been # mounted read-write. @@ -384,16 +389,14 @@ if [ -x /etc/rc.d/rc.cgconfig -a -x /etc/rc.d/rc.cgred -a -d /sys/fs/cgroup ]; t fi # Clean up some temporary files: -rm -f /var/run/* /var/run/*/* /var/run/*/*/* /etc/nologin \ - /etc/dhcpc/*.pid /etc/forcefsck /etc/fastboot \ - /var/state/saslauthd/saslauthd.pid \ - /tmp/.Xauth* 1> /dev/null 2> /dev/null +rm -f /etc/nologin /etc/dhcpc/*.pid /etc/forcefsck /etc/fastboot \ + /var/state/saslauthd/saslauthd.pid /tmp/.Xauth* 1> /dev/null 2> /dev/null +rm -rf /tmp/{kde-[a-zA-Z]*,ksocket-[a-zA-Z]*,hsperfdata_[a-zA-Z]*,plugtmp*} if [ -d /var/lib/pkgtools/setup/tmp ]; then ( cd /var/lib/pkgtools/setup/tmp && rm -rf * ) elif [ -d /var/log/setup/tmp ]; then ( cd /var/log/setup/tmp && rm -rf * ) fi -( cd /tmp && rm -rf kde-[a-zA-Z]* ksocket-[a-zA-Z]* hsperfdata_[a-zA-Z]* plugtmp* ) # Clear /var/lock/subsys: if [ -d /var/lock/subsys ]; then diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild index 67beccea..d3537dab 100755 --- a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild +++ b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sysvinit-scripts VERSION=${VERSION:-2.1} ARCH=noarch -BUILD=${BUILD:-28} +BUILD=${BUILD:-29} # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information diff --git a/source/a/util-linux/doinst.sh b/source/a/util-linux/doinst.sh index f3010148..da24e743 100644 --- a/source/a/util-linux/doinst.sh +++ b/source/a/util-linux/doinst.sh @@ -22,3 +22,6 @@ config etc/rc.d/rc.serial.new config etc/rc.d/rc.setterm.new config etc/serial.conf.new +if [ -r etc/default/su.new ]; then + config etc/default/su.new +fi diff --git a/source/a/util-linux/su.default b/source/a/util-linux/su.default new file mode 100644 index 00000000..73fb50a0 --- /dev/null +++ b/source/a/util-linux/su.default @@ -0,0 +1,3 @@ +# Ensure that ENV_SUPATH from /etc/login.defs is used for the $PATH when +# 'su' is used. Otherwise /sbin paths will be missing unless 'su -' is used. +ALWAYS_SET_PATH yes diff --git a/source/a/util-linux/util-linux.SlackBuild b/source/a/util-linux/util-linux.SlackBuild index 662eb75c..1d101d46 100755 --- a/source/a/util-linux/util-linux.SlackBuild +++ b/source/a/util-linux/util-linux.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=util-linux VERSION=${VERSION:-$(echo util-linux*.tar.xz | cut -d - -f 3 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} ADJTIMEXVERS=1.29 SETSERIALVERS=2.17 @@ -85,6 +85,11 @@ find . \ # Choose correct options depending on whether PAM is installed: if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then LOGIN_OPTIONS="" + # Add su default file to ensure using ENV_SUPATH with 'su': + mkdir -p $PKG/etc/default + cp -a $CWD/su.default $PKG/etc/default/su.new + chown root:root $PKG/etc/default/su.new + chmod 644 $PKG/etc/default/su.new else LOGIN_OPTIONS="--disable-login" fi |