summaryrefslogtreecommitdiffstats
path: root/slackware64-current/source/a/sysvinit-scripts
diff options
context:
space:
mode:
authorAdrien Nader <adrien@notk.org>2012-09-24 23:36:02 +0200
committerAdrien Nader <adrien@notk.org>2012-09-24 23:36:02 +0200
commitdffc38e3ac99f0619bd8b82500328e547e31e12d (patch)
tree5513854574e09adc16478cb9a0cfd58dafb97fb4 /slackware64-current/source/a/sysvinit-scripts
parentd2b75f65abfc251d3a4800f8f5bff6b72e85ea42 (diff)
Mon Sep 24 20:25:12 UTC 2012
Here are a few minor bugfixes as well as a couple more test drivers for X: a/e2fsprogs-1.42.6-x86_64-1.txz: Upgraded. This is a bugfix release. a/sysvinit-scripts-2.0-noarch-12.txz: Rebuilt. In rc.M, don't run rc.wicd if /usr/sbin/wicd does not exist. This change prevents a leftover rc.wicd from blocking NetworkManager startup. l/gamin-0.1.10-x86_64-5.txz: Rebuilt. Patched to fix a deadlock bug, and to fix building against recent libraries. Thanks to sberthelot, sombragris, and ponce on LQ. l/mozilla-nss-3.13.5-x86_64-3.txz: Rebuilt. Added libcrmf.a to the package, needed to compile xulrunner. Thanks to Robby Workman. isolinux/initrd.img: Rebuilt. Upgraded to e2fsprogs-1.42.6. testing/packages/xf86-video-intel-2.20.8-x86_64-1.txz: Added. This driver requires the libdrm in /testing. testing/packages/xf86-video-ati-6.14.6-x86_64-1.txz: Added. This driver requires the libdrm in /testing. testing/source/config-testing-3.*: Rebuilt. Changed CONFIG_GFS2_FS in huge kernels from y -> m to fix the compile. usb-and-pxe-installers/usbboot.img: Rebuilt. Upgraded to e2fsprogs-1.42.6.
Diffstat (limited to 'slackware64-current/source/a/sysvinit-scripts')
-rw-r--r--slackware64-current/source/a/sysvinit-scripts/scripts/rc.M2
-rwxr-xr-xslackware64-current/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild2
2 files changed, 2 insertions, 2 deletions
diff --git a/slackware64-current/source/a/sysvinit-scripts/scripts/rc.M b/slackware64-current/source/a/sysvinit-scripts/scripts/rc.M
index e7ef0b694..fd31211cd 100644
--- a/slackware64-current/source/a/sysvinit-scripts/scripts/rc.M
+++ b/slackware64-current/source/a/sysvinit-scripts/scripts/rc.M
@@ -189,7 +189,7 @@ if [ -x /etc/rc.d/rc.bluetooth ]; then
fi
# Start wicd or networkmanager:
-if [ -x /etc/rc.d/rc.wicd ]; then
+if [ -x /etc/rc.d/rc.wicd -a -x usr/sbin/wicd ]; then
sh /etc/rc.d/rc.wicd start
elif [ -x /etc/rc.d/rc.networkmanager ]; then
sh /etc/rc.d/rc.networkmanager start
diff --git a/slackware64-current/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/slackware64-current/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
index fbd624ba3..339bd5038 100755
--- a/slackware64-current/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
+++ b/slackware64-current/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
@@ -23,7 +23,7 @@
VERSION=${VERSION:-2.0}
ARCH=noarch
-BUILD=${BUILD:-11}
+BUILD=${BUILD:-12}
CWD=$(pwd)
TMP=${TMP:-/tmp}