April 2011 - Arch-projects - lists.archlinux.org

[arch-projects] [PATCH] [RFC][mkinitcpio] Cleanly stop udev >= 168 as recommended by upstream.
by Gerardo Exequiel Pozzi 02 May '11

02 May '11

N0: udev >= 168 is needed. N1: I guess the order is correct (first cleanup then exit). N2: device-mapper/LVM udev rules must be parsed for initramfs creation to add OPTIONS+="db_persist" >From udev NEWS: The running udev daemon can now cleanly shut down with: udevadm control --exit Udev in initramfs should clean the state of the udev database with: udevadm info --cleanup-db which will remove all state left behind from events/rules in initramfs. If initramfs uses --cleanup-db and device-mapper/LVM, the rules in initramfs need to add OPTIONS+="db_persist" for all dm devices. This will prevent removal of the udev database for these devices. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- init | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/init b/init index 7b81a1a..a2c6c8a 100644 --- a/init +++ b/init @@ -118,15 +118,10 @@ elif [ ! -x "/new_root${init}" ]; then launch_interactive_shell --exec fi -#Special handling if udev is running -udevpid=$(/bin/pidof udevd) -if [ -n "${udevpid}" ]; then - # Settle pending uevents, then kill udev - /sbin/udevadm settle - /bin/kill ${udevpid} > /dev/null 2>&1 - while /bin/pidof udevd >/dev/null; do - sleep 0.1 - done +# Stop udevd if is running +if [ "${udevd_running}" -eq 1 ]; then + /sbin/udevadm info --cleanup-db + /sbin/udevadm control --exit fi for d in proc sys dev run; do -- 1.7.5

4 6

[arch-projects] [PATCH] [initscripts] Change stat_busy()/stat_done() -> status()
by Gerardo Exequiel Pozzi 30 Apr '11

30 Apr '11

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- rc.shutdown | 17 +++++------------ rc.single | 5 +---- rc.sysinit | 3 +-- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/rc.shutdown b/rc.shutdown index a78bc4d..604fdec 100755 --- a/rc.shutdown +++ b/rc.shutdown @@ -42,15 +42,12 @@ fi # Write to wtmp file before unmounting /sbin/halt -w -stat_busy "Deactivating Swap" -/sbin/swapoff -a -stat_done +status "Deactivating Swap" /sbin/swapoff -a # stop monitoring of lvm2 groups before unmounting filesystems if [[ $USELVM =~ yes|YES && -x /sbin/lvm && -d /sys/block ]]; then - stat_busy "Deactivating monitoring of LVM2 groups" - /sbin/vgchange --monitor n >/dev/null 2>&1 - stat_done + status "Deactivating monitoring of LVM2 groups" \ + /sbin/vgchange --monitor n >/dev/null 2>&1 fi stat_busy "Unmounting Filesystems" @@ -83,14 +80,10 @@ if [[ -f /etc/crypttab && -n $CS ]] && /bin/grep -q ^[^#] /etc/crypttab; then fi if [[ $USELVM =~ yes|YES && -x /sbin/lvm && -d /sys/block ]]; then - stat_busy "Deactivating LVM2 groups" - /sbin/vgchange --sysinit -a n >/dev/null 2>&1 - stat_done + status "Deactivating LVM2 groups" /sbin/vgchange --sysinit -a n >/dev/null 2>&1 fi -stat_busy "Remounting Root Filesystem Read-only" -/bin/mount -n -o remount,ro / -stat_done +status "Remounting Root Filesystem Read-only" /bin/mount -n -o remount,ro / run_hook shutdown_poweroff diff --git a/rc.single b/rc.single index 06bd83c..d1191d2 100755 --- a/rc.single +++ b/rc.single @@ -10,10 +10,7 @@ run_hook single_start if [[ $PREVLEVEL != N ]]; then kill_everything single - stat_busy "Starting UDev Daemon" - /sbin/udevd --daemon - stat_done - + status "Starting UDev Daemon" /sbin/udevd --daemon run_hook single_udevlaunched # Trigger udev uevents diff --git a/rc.sysinit b/rc.sysinit index dc4be58..e07afe6 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -275,8 +275,7 @@ if [[ -x /sbin/fsck ]]; then stat_done fi -stat_busy "Mounting Local Filesystems" -/bin/mount -n -o remount,rw / +status "Mounting Local Filesystems" /bin/mount -n -o remount,rw / # don't touch /etc/mtab if it is a symlink to /proc/self/mounts if [[ -L /etc/mtab ]]; then -- 1.7.5

2 1

[arch-projects] [PATCH 1/2] [mkinitcpio] Drop deprecated /proc/sys/kernel/hotplug
by Gerardo Exequiel Pozzi 30 Apr '11

30 Apr '11

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- init | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/init b/init index e230f82..7b81a1a 100644 --- a/init +++ b/init @@ -32,7 +32,6 @@ parse_cmdline # if available, start udevd at this stage if [ -x /sbin/udevd ]; then msg ":: Starting udevd..." - echo > /proc/sys/kernel/hotplug /sbin/udevd --daemon --resolve-names=never udevd_running=1 msg "done." -- 1.7.5

2 3

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2011.04.1-24-ge98a352
by tomegun＠archlinux.org 30 Apr '11

30 Apr '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Arch Linux initscripts repository". The branch, master has been updated via e98a352e9568ec31b33af8671987d026f1f73647 (commit) via 69b4aac9d13d3c4a6c4604cfb763033aa0dab3d6 (commit) from a43cb3c03ca768956ceb9e2856683eae5c48c68f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e98a352e9568ec31b33af8671987d026f1f73647 Merge: a43cb3c 69b4aac Author: Tom Gundersen <teg(a)jklm.no> Date: Sat Apr 30 21:30:29 2011 +0200 Merge remote-tracking branch 'seblu/master' Conflicts: rc Trivial conflict with Dave's counting vs summing patch. Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit 69b4aac9d13d3c4a6c4604cfb763033aa0dab3d6 Author: Sebastien Luttringer <seblu(a)seblu.net> Date: Sun Apr 24 23:25:10 2011 +0200 rc cleaning run rc.d scripts rc helper now call rc.d scripts in root directory with a clean environment. Chosen vars came from init man page. It allows to launch scripts from the command line, as if they had been launched by init Signed-off-by: Sebastien Luttringer <seblu(a)seblu.net> ----------------------------------------------------------------------- Summary of changes: rc | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2011.04.1-22-ga43cb3c
by tomegun＠archlinux.org 30 Apr '11

30 Apr '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Arch Linux initscripts repository". The branch, master has been updated via a43cb3c03ca768956ceb9e2856683eae5c48c68f (commit) via 05d4eaa92f004f066e47de0453384563f2c5f867 (commit) via 8dcc8d0e030aa4b84f02d1a862335afd74b772e8 (commit) via bcbcea89b153aed0c905201c14ea3d3e3a1ee043 (commit) from e0153f33ea46d23da4add5409b344e3cc050c6cc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a43cb3c03ca768956ceb9e2856683eae5c48c68f Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Sat Apr 30 15:41:12 2011 -0300 workaround: do not set property=STARTUP=1 when calling udevadm Apply same logic like in rc.sysinit (commit c3063d0400e7a55c9dbd6ff1b76887744e9b6224) Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit 05d4eaa92f004f066e47de0453384563f2c5f867 Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Sat Apr 30 15:41:11 2011 -0300 Change udev trigger order Respect the order documented at udev README and systemd files. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit 8dcc8d0e030aa4b84f02d1a862335afd74b772e8 Author: Ian-Xue Li <da.mi.spirit(a)gmail.com> Date: Sat Apr 30 21:16:09 2011 +0200 rc.shutdown should recognize LVM upon LUKS option This fixes FS#23889. Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit bcbcea89b153aed0c905201c14ea3d3e3a1ee043 Author: Dave Reisner <d(a)falconindy.com> Date: Sun Apr 24 17:35:05 2011 -0400 rc: exit with error count, not error sum cc199761f assumes that /etc/rc.d scripts will exit with a value of 0 or 1. Since this can't be guaranteed, clamp the return value to 0 or 1 before adding it to the exit value. Note that a lot of /etc/rc.d scripts don't properly exit with 0 or 1, so this is more of a forward looking change in the hope that these scripts are cleaned up. Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: rc | 2 +- rc.shutdown | 5 +++++ rc.single | 9 +++------ rc.sysinit | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [PATCH 1/2] [initscripts] Change udev trigger order
by Gerardo Exequiel Pozzi 30 Apr '11

30 Apr '11

Respect the order documented at udev README and systemd files. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- rc.single | 2 +- rc.sysinit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rc.single b/rc.single index b9701d5..8c3358f 100755 --- a/rc.single +++ b/rc.single @@ -20,8 +20,8 @@ if [[ $PREVLEVEL != N ]]; then if /bin/pidof -o %PPID /sbin/udevd >/dev/null; then stat_busy "Triggering UDev uevents" /sbin/udevadm control --property=STARTUP=1 - /sbin/udevadm trigger --action=add --type=devices /sbin/udevadm trigger --action=add --type=subsystems + /sbin/udevadm trigger --action=add --type=devices stat_done fi diff --git a/rc.sysinit b/rc.sysinit index 2262d32..dc4be58 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -90,8 +90,8 @@ 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=devices /sbin/udevadm trigger --action=add --type=subsystems + /sbin/udevadm trigger --action=add --type=devices stat_done fi -- 1.7.5

2 3

[arch-projects] [initscripts][PATCH] rc: exit with error count, not error sum
by Dave Reisner 30 Apr '11

30 Apr '11

cc199761f assumes that /etc/rc.d scripts will exit with a value of 0 or 1. Since this can't be guaranteed, clamp the return value to 0 or 1 before adding it to the exit value. --- rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rc b/rc index 1e64119..54dc11c 100755 --- a/rc +++ b/rc @@ -45,7 +45,7 @@ case $1 in shift for i; do [[ -x "/etc/rc.d/$i" ]] && "/etc/rc.d/$i" $action - (( ret += $? )) + (( ret += !! $? )) # clamp exit value to 0/1 done esac -- 1.7.4.4

3 5

[arch-projects] Patch for FS#23889
by Ian-Xue Li 30 Apr '11

30 Apr '11

Hi, sttaching a possible patch for FS#23889. https://bugs.archlinux.org/task/23889 Regards. -- Li Ian-Xue http://b4283.ath.cx

3 2

[arch-projects] [devtools] [PATCH] checkpkg: remove checking for old style package names
by Allan McRae 27 Apr '11

27 Apr '11

All the packages in the Arch repo have been rebuilt to include the architecture in their package names so this workaround is no longer needed. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This is applied on top of the patch Eric sent just prior to this. checkpkg | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/checkpkg b/checkpkg index feb9c70..e669718 100755 --- a/checkpkg +++ b/checkpkg @@ -37,16 +37,11 @@ for _pkgname in ${pkgname[@]}; do else pkgfile=${_pkgname}-${epoch}:${pkgver}-${pkgrel}-${CARCH}${PKGEXT} fi - oldstylepkgfile=${_pkgname}-${pkgver}-${pkgrel}${PKGEXT} if [ -f "$STARTDIR/$pkgfile" ]; then cp "$STARTDIR/$pkgfile" . elif [ -f "$PKGDEST/$pkgfile" ]; then cp "$PKGDEST/$pkgfile" . - elif [ -f "$STARTDIR/$oldstylepkgfile" ]; then - cp "$STARTDIR/$oldstylepkgfile" . - elif [ -f "$PKGDEST/$oldstylepkgfile" ]; then - cp "$PKGDEST/$oldstylepkgfile" . else echo "File \"$pkgfile\" doesn't exist" exit 1 -- 1.7.5

1 0

[arch-projects] [devtools] checkpkg: Added epoch support
by Eric Bélanger 27 Apr '11

27 Apr '11

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- checkpkg | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/checkpkg b/checkpkg index e1f8b8b..feb9c70 100755 --- a/checkpkg +++ b/checkpkg @@ -32,7 +32,11 @@ TEMPDIR=$(mktemp -d /tmp/checkpkg-script.XXXX) cd $TEMPDIR for _pkgname in ${pkgname[@]}; do - pkgfile=${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} + if [ -z ${epoch} ] ; then + pkgfile=${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} + else + pkgfile=${_pkgname}-${epoch}:${pkgver}-${pkgrel}-${CARCH}${PKGEXT} + fi oldstylepkgfile=${_pkgname}-${pkgver}-${pkgrel}${PKGEXT} if [ -f "$STARTDIR/$pkgfile" ]; then -- 1.7.5

1 0