[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)
Tobias Powalowski
tpowa at archlinux.org
Sat Jan 14 10:50:59 UTC 2012
Date: Saturday, January 14, 2012 @ 05:50:59
Author: tpowa
Revision: 146611
upgpkg: hwdetect 2012.01-1
add fsck and shutdown options to HOOKS
Modified:
hwdetect/trunk/PKGBUILD
hwdetect/trunk/hwdetect
----------+
PKGBUILD | 6 +++---
hwdetect | 11 +++++++++--
2 files changed, 12 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-01-14 08:51:04 UTC (rev 146610)
+++ PKGBUILD 2012-01-14 10:50:59 UTC (rev 146611)
@@ -1,8 +1,8 @@
# $Id$
# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
pkgname=hwdetect
-pkgver=2011.08
-pkgrel=3
+pkgver=2012.01
+pkgrel=1
pkgdesc="Hardware detection script with loading modules and mkinitcpio.conf / rc.conf support"
arch=(any)
license=('GPL')
@@ -16,4 +16,4 @@
build() {
install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/sbin/hwdetect
}
-md5sums=('771a88faf3e67fee2d38f125a8b27a2d')
+md5sums=('cdb979d7642145274bd1e57a8c4b9b83')
Modified: hwdetect
===================================================================
--- hwdetect 2012-01-14 08:51:04 UTC (rev 146610)
+++ hwdetect 2012-01-14 10:50:59 UTC (rev 146611)
@@ -51,6 +51,7 @@
echo " --pcmcia add pcmcia to HOOKS="
echo " --nfs add net to HOOKS="
echo " --btrfs add btrfs to HOOKS="
+ echo " --shutdown add shutdown to HOOKS="
echo ""
echo " For persistent sound and network files use:"
echo " --net generate /tmp/network_persistent.rules"
@@ -107,9 +108,12 @@
# nfs switch
[ "$(echo $* | grep '\-nfs')" ] && NFS=1
-# nfs switch
+# btrfs switch
[ "$(echo $* | grep '\-btrfs')" ] && BTRFS=1
+# shutdown switch
+[ "$(echo $* | grep '\-shutdown')" ] && SHUTDOWN=1
+
# hooks switch
[ "$(echo $* | grep '\-hooks')" ] && HOOKS=1
@@ -507,7 +511,7 @@
if [ "$HOOKS_DIR" = "" ]; then
HOOKS_DIR="/lib/initcpio/install"
fi
- START_HOOKS="base v86d udev keymap autodetect ide pata scsi sata usb fw pcmcia net dmraid usbinput $ADVANCED btrfs filesystems"
+ START_HOOKS="base v86d udev keymap fsck autodetect ide pata scsi sata usb fw pcmcia net dmraid usbinput $ADVANCED btrfs filesystems shutdown"
# remove the ones that don't exist on the system
for i in ${START_HOOKS}; do
if ! [ -e "${HOOKS_DIR}/$i" ]; then
@@ -547,6 +551,9 @@
if ! [ "$BTRFS" = "1" ]; then
START_HOOKS=$(echo $START_HOOKS | sed -e "s/btrfs//g")
fi
+ if ! [ "$SHUTDOWN" = "1" ]; then
+ START_HOOKS=$(echo $START_HOOKS | sed -e "s/shutdown//g")
+ fi
echo "HOOKS=\"$START_HOOKS\"" | sed -e 's/"\ /"/g' -e 's/\ "/"/g' -e 's/\ \ /\ /g'
;;
--advanced) ADVANCED_ARCHBOOT=""
More information about the arch-commits
mailing list