- Arch-projects - lists.archlinux.org

[arch-projects] [PATCH mkinitcpio] hooks: add usr hook
by Tom Gundersen 02 Aug '11

02 Aug '11

This allows /usr to be mounted from within the initrd. Advanced setups might not work. It is recommended to move /usr to the rootfs. Signed-off-by: Tom Gundersen <teg(a)jklm.no> --- hooks/usr | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) create mode 100644 hooks/usr diff --git a/hooks/usr b/hooks/usr new file mode 100644 index 0000000..b1090ae --- /dev/null +++ b/hooks/usr @@ -0,0 +1,17 @@ +# vim: set ft=sh: +run_hook () +{ + mount_handler=usr_monut_handler +} + +usr_mount_handler () { + # mount / + default_mount_handler "$@" + + # mount /usr + msg -n ":: Mounting /usr..." + cp /new_root/etc/fstab /etc/fstab + mount /usr + mount --move /usr /new_root/usr + msg "done." +} -- 1.7.6

1 0

[arch-projects] [mkinitcpio] boot times with different COMPRESSIONs
by Tom Gundersen 01 Aug '11

01 Aug '11

Hi guys, We have a lot of compression options now for mkinitcpio, so I figured I'd try to measure which one gives us the fastest boot. I guess boot speed is the most important metric when deciding which one to choose. The measurements were done on an Lenovo ThinkPad x60, with an Intel Core 2 processor and an 5400 rpm HDD, so your milage might obviously vary. Here are my numbers: xz Startup finished in 710ms (kernel) + 2526ms (initrd) + 14335ms (userspace) = 17572ms Startup finished in 610ms (kernel) + 2448ms (initrd) + 48159ms (userspace) = 51218ms Startup finished in 710ms (kernel) + 2458ms (initrd) + 11294ms (userspace) = 14462ms Startup finished in 720ms (kernel) + 2488ms (initrd) + 12271ms (userspace) = 15480ms Startup finished in 710ms (kernel) + 2446ms (initrd) + 9602ms (userspace) = 12758ms gzip Startup finished in 560ms (kernel) + 2422ms (initrd) + 9917ms (userspace) = 12899ms Startup finished in 560ms (kernel) + 2445ms (initrd) + 9734ms (userspace) = 12740ms Startup finished in 560ms (kernel) + 2451ms (initrd) + 10544ms (userspace) = 13556ms Startup finished in 560ms (kernel) + 2427ms (initrd) + 9756ms (userspace) = 12744ms Startup finished in 570ms (kernel) + 2439ms (initrd) + 9823ms (userspace) = 12832ms bzip2 Startup finished in 810ms (kernel) + 2428ms (initrd) + 9690ms (userspace) = 12928ms Startup finished in 810ms (kernel) + 2448ms (initrd) + 9635ms (userspace) = 12893ms Startup finished in 810ms (kernel) + 2504ms (initrd) + 10212ms (userspace) = 13526ms Startup finished in 810ms (kernel) + 2445ms (initrd) + 8838ms (userspace) = 12094ms Startup finished in 820ms (kernel) + 2438ms (initrd) + 9613ms (userspace) = 12871ms lzma Startup finished in 790ms (kernel) + 2441ms (initrd) + 9335ms (userspace) = 12567ms Startup finished in 790ms (kernel) + 2442ms (initrd) + 9662ms (userspace) = 12895ms Startup finished in 770ms (kernel) + 2432ms (initrd) + 10199ms (userspace) = 13401ms Startup finished in 770ms (kernel) + 2425ms (initrd) + 9922ms (userspace) = 13117ms Startup finished in 770ms (kernel) + 2435ms (initrd) + 9502ms (userspace) = 12708ms lzop Startup finished in 550ms (kernel) + 2461ms (initrd) + 10730ms (userspace) = 13742ms Startup finished in 570ms (kernel) + 2421ms (initrd) + 20680ms (userspace) = 23671ms Startup finished in 550ms (kernel) + 2435ms (initrd) + 8752ms (userspace) = 11738ms Startup finished in 570ms (kernel) + 2454ms (initrd) + 9575ms (userspace) = 12600ms Startup finished in 550ms (kernel) + 2453ms (initrd) + 8540ms (userspace) = 11543ms Cheers, Tom

2 2

[arch-projects] [PATCH 1/2 mkinitcpio] shutdown: add a shutdown hook
by Tom Gundersen 01 Aug '11

01 Aug '11

Enabling the shutdown hook and using systemd v31 (which is yet to be released), means that on shutdown the root will be pivoted to /run/initramfs, from where the rootfs and all its submonuts (such as /usr) are unmounted cleanly. The same functionality will be supported in a future release of initscript. A natural next step is to add an "/usr"-hook, which mounts the /usr partition (if it exists) in the initramfs, so initscripts (and systemd) can always rely on it being mounted, and we no longer need to move some binaries/libraries to /bin, /sbin and /lib (as this does not work well at the moment). One might argue that this functionality does not beling in mkinitrd. The reason I propose it for inclusion here is: - it is independent of initscripts, so does not really belong there either. - in the future one might imagine extending this to integrate more tightly with the rest of the initramfs (e.g. store state/logs in /run/initramfs to ease debugging, or add shutdown-hooks, to go with the boot-hooks, to gracefully tear down things such as dm or nfs mounts at shutdown). - by behaving like dracut, integrating with systemd became trivial, and IMHO there is no point in systemd/initscripts/dracut/mkinitrd differing at the interface level. Signed-off-by: Tom Gundersen <teg(a)jklm.no> --- v2: copy the needed libraries to the new ramfs v3: support for 32-bit, and cleanup v4: fix Makefile++ v5: include all the needed libraries (typo) Makefile | 2 +- hooks/shutdown | 17 +++++++++++++++++ install/shutdown | 16 ++++++++++++++++ shutdown | 12 ++++++++++++ 4 files changed, 46 insertions(+), 1 deletions(-) create mode 100644 hooks/shutdown create mode 100644 install/shutdown create mode 100644 shutdown diff --git a/Makefile b/Makefile index 18df47f..56783bb 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ install: all chmod 755 ${DESTDIR}/bin/lsinitcpio ${DESTDIR}/sbin/mkinitcpio install -m644 mkinitcpio.conf ${DESTDIR}/etc/mkinitcpio.conf - install -m755 -t ${DESTDIR}/lib/initcpio init + install -m755 -t ${DESTDIR}/lib/initcpio init shutdown install -m644 -t ${DESTDIR}/lib/initcpio init_functions functions install -m644 01-memdisk.rules ${DESTDIR}/lib/initcpio/udev/01-memdisk.rules diff --git a/hooks/shutdown b/hooks/shutdown new file mode 100644 index 0000000..505d2d6 --- /dev/null +++ b/hooks/shutdown @@ -0,0 +1,17 @@ +# vim: set ft=sh: +run_hook () +{ + msg -n ":: Creating shutdown ramfs..." + mkdir -p /run/initramfs/usr/bin + mkdir /run/initramfs/usr/sbin + mkdir /run/initramfs/bin + mkdir /run/initramfs/sbin + mkdir /run/initramfs/lib + cp /bin/busybox /run/initramfs/bin/ + cp -P /lib/ld-* /run/initramfs/lib/ + cp -P /lib/libc* /run/initramfs/lib/ + + chroot /run/initramfs /bin/busybox --install + cp /shutdown /run/initramfs/ + msg "done." +} diff --git a/install/shutdown b/install/shutdown new file mode 100644 index 0000000..3e37326 --- /dev/null +++ b/install/shutdown @@ -0,0 +1,16 @@ +#!/bin/bash + +build() { + SCRIPT="shutdown" + add_binary /lib/initcpio/shutdown /shutdown +} + +help () { + cat <<HELPEOF +This hook will create a shutdown initrd in /run/initramfs +that we can pivot to on shutdown in order to unmount / +(and any submounts such as /usr) cleanly. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/shutdown b/shutdown new file mode 100644 index 0000000..db2d394 --- /dev/null +++ b/shutdown @@ -0,0 +1,12 @@ +#!/bin/sh +# shutdown + +# unmount everything that was mounted on the old root +umount `mount | awk '{ print $3 }' | grep "^/oldroot" | sort -r` + +# reboot / poweroff / halt, depending on the argument passed by init +# if something invalid is passed, we halt +case "$1" in + reboot|poweroff|halt) "$1" -f ;; + *) halt -f;; +esac -- 1.7.6

1 1

[arch-projects] [initscripts] Add manpage for rc.d script
by Elvis Stansvik 31 Jul '11

31 Jul '11

As suggested by Tom at [1], I'm sending this patch here (see attachment). Please proof-read and give comments. Cheers, Elvis [1] https://bugs.archlinux.org/task/25269

4 9

[arch-projects] [initscripts][PATCH 1/2] arch-tmpfiles: avoid subshell in creating empty files
by Dave Reisner 31 Jul '11

31 Jul '11

install /dev/null as the new file instead of creating an empty file via a no-op process substitution. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- arch-tmpfiles | 4 ++-- rc.shutdown | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch-tmpfiles b/arch-tmpfiles index c646ecd..f133a40 100755 --- a/arch-tmpfiles +++ b/arch-tmpfiles @@ -49,7 +49,7 @@ _f() { fi if [[ ! -e $path ]]; then - install -m"$mode" -o"$uid" -g"$gid" <(:) "$path" + install -m"$mode" -o"$uid" -g"$gid" /dev/null "$path" fi } @@ -64,7 +64,7 @@ _F() { return fi - install -m"$mode" -o"$uid" -g"$gid" <(:) "$path" + install -m"$mode" -o"$uid" -g"$gid" /dev/null "$path" } _d() { diff --git a/rc.shutdown b/rc.shutdown index ebfc22c..c70a4ca 100755 --- a/rc.shutdown +++ b/rc.shutdown @@ -27,7 +27,7 @@ run_hook shutdown_postkillall stat_busy "Saving Random Seed" RANDOM_SEED=/var/lib/misc/random-seed - install -TDm 0600 <(:) $RANDOM_SEED + install -TDm 0600 /dev/null $RANDOM_SEED POOL_FILE=/proc/sys/kernel/random/poolsize if [[ -r $POOL_FILE ]]; then read POOL_SIZE < $POOL_FILE -- 1.7.6

2 3

[arch-projects] [initscripts][PATCH 2/2] rc.d: Add check to cleanly abort rc.d script if user doesn't have root privileges
by Eric Bélanger 29 Jul '11

29 Jul '11

This implements FS#24095. The check is only made for the start, stop and restart actions of the daemon scripts. This allows regular user to use the help and list functionality of rc.d and also to use rc.d for actions that doesn't require root privileges, like the status action of some daemon scripts. Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- rc.d | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/rc.d b/rc.d index 97f266a..2325623 100755 --- a/rc.d +++ b/rc.d @@ -43,6 +43,10 @@ case $1 in ;; *) action=$1 + if [[ "$EUID" != '0' ]] && [[ "$action" == 'start' || "$action" == 'stop' || "$action" == 'restart' ]] ; then + echo 'Error: this script must be run as root to use this functionality.' + exit 1 + fi shift # set same environment variables as init runlevel=$(/sbin/runlevel) -- 1.7.5.2

4 13

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository annotated tag show created. 2011.07.2
by tomegun＠archlinux.org 28 Jul '11

28 Jul '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 annotated tag, show has been created at ac5b2555ac471ee390fb36360282f2d2ab95479a (tag) tagging 76b5afd054d73b5c22eb7ee36e081eca40395457 (commit) replaces 2011.07.1 tagged by Tom Gundersen on Tue Jul 26 19:52:35 2011 +0200 - Log ----------------------------------------------------------------- Fix improper creation of utmp. This was causing problems with detecting the runlevel. Dave Reisner (1): tmpfiles.conf: fix improper creation of /var/run/utmp Sebastien Luttringer (1): Add /etc/tmpfiles.d into makefile Tom Gundersen (1): Merge remote-tracking branch 'falconindy/working' ----------------------------------------------------------------------- hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository annotated tag 2011.07.3 created. 2011.07.3
by tomegun＠archlinux.org 28 Jul '11

28 Jul '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 annotated tag, 2011.07.3 has been created at 8fe1338ca9ae29122e93760f41573f89e19e68b9 (tag) tagging 92ef85ff23d548f6dc9be3fb9b73a050f596941f (commit) replaces 2011.07.2 tagged by Tom Gundersen on Thu Jul 28 14:33:56 2011 +0200 - Log ----------------------------------------------------------------- Changes to rc.conf ------------------ The VERBOSE parameter no longer has an effect, use the kernel's loglevel= parameter instead. Most people probably wants to pass 'quiet' to the kernel. Alternatively, a new init hook could be added to /etc/rc.d/functions.d/dmesg: sysinit_start () { dmesg -n 3 } If HARDWARECLOCK is empty we will read the value of UTC/LOCAL from hwclock's adjfile instead. To avoid interacting with the hardwareclock set HARDWARECLOCK="IGNORE" (this should never be needed, and might be removed in the future). We now support (optionally) setting the broadcast address in the new network config. Behavioral changes ------------------ We no longer silence errors thrown by udev. In particular, if udevadm --settle times out, we get an error message. We no longer adjust the rtc on boot, as it is unreliable, we only make corrections for the timezone. We no longer mount /run as noexec. Misc changes ------------ Cleaning up of /tmp and friends is now done by an external tool. This tool is intended to allow pac kages to maintain {/var,}/run{/lock,} in the absense of rc scripts. General refactoring which should make maintenance and writing custom hooks easier. Revert the NEED_ROOT functionality. It is now off by default, and has to be enabled by the rc scripts that wants to force root. Tom Gundersen (1): NEED_ROOT: default to off ----------------------------------------------------------------------- hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2011.07.3
by tomegun＠archlinux.org 28 Jul '11

28 Jul '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 92ef85ff23d548f6dc9be3fb9b73a050f596941f (commit) from 76b5afd054d73b5c22eb7ee36e081eca40395457 (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 92ef85ff23d548f6dc9be3fb9b73a050f596941f Author: Tom Gundersen <teg(a)jklm.no> Date: Thu Jul 28 14:21:07 2011 +0200 NEED_ROOT: default to off This keeps the functionality, but disables it by default. Individual scripts/functions can turn it on if they want. Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: functions | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository annotated tag 2011.07.2 created. 2011.07.2
by tomegun＠archlinux.org 26 Jul '11

26 Jul '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 annotated tag, 2011.07.2 has been created at ac5b2555ac471ee390fb36360282f2d2ab95479a (tag) tagging 76b5afd054d73b5c22eb7ee36e081eca40395457 (commit) replaces 2011.07.1 tagged by Tom Gundersen on Tue Jul 26 19:52:35 2011 +0200 - Log ----------------------------------------------------------------- Fix improper creation of utmp. This was causing problems with detecting the runlevel. Dave Reisner (1): tmpfiles.conf: fix improper creation of /var/run/utmp Sebastien Luttringer (1): Add /etc/tmpfiles.d into makefile Tom Gundersen (1): Merge remote-tracking branch 'falconindy/working' ----------------------------------------------------------------------- hooks/post-receive -- Arch Linux initscripts repository

1 0