March 2012 - Arch-projects - lists.archlinux.org

[arch-projects] [PATCH initscripts 0/4] allow random seed to be loaded before cryptsetup
by Matthew Monaco 14 Mar '12

14 Mar '12

From: Matthew Monaco <matthew.monaco(a)0x01b.net> The ultimate goal here is FS#17131. I couldn't quite tell the best approach in some places from looking at the existing code because there's a little bit of everything. For example, I define RANDOM_SEED in functions, but use it in rc.sysinit. Is this ok for variables? I wanted to keep the status text in rc.sysinit. Is this worthwhile? Can/Should it go within the function? Matthew Monaco (4): functions: new funcs for random seed handling init/shutdown: use {load,store}_random_seed() rc.sysinit: load seed before cryptsetup (FS#17131) rc.sysinit: store random seed after loading functions | 21 +++++++++++++++++++++ rc.shutdown | 13 +------------ rc.sysinit | 14 ++++++++++---- 3 files changed, 32 insertions(+), 16 deletions(-) -- 1.7.9.4

2 7

[arch-projects] [INITSCRIPTS][PATCH 1/2] arch-binfmt: move api filesytem mounting from rc.sysinit
by Sébastien Luttringer 14 Mar '12

14 Mar '12

this will avoid filesytem to be mounted at every startup if not binfmt is used Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> --- arch-binfmt | 31 ++++++++++++++++++++----------- rc.sysinit | 4 +--- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/arch-binfmt b/arch-binfmt index 6931843..91468ef 100755 --- a/arch-binfmt +++ b/arch-binfmt @@ -7,20 +7,29 @@ shopt -s nullglob -declare -a binfmt_d=( - /usr/lib/binfmt.d/*.conf - /etc/binfmt.d/*.conf - /run/binfmt.d/*.conf -) -declare -A fragments +declare -a binfmt_d +# files given has argv supersede config files +if (( $# > 0 )); then + for arg; do [[ -r "$arg" ]] && binfmt_d+=("$arg"); done +else + binfmt_d=( + /usr/lib/binfmt.d/*.conf + /etc/binfmt.d/*.conf + /run/binfmt.d/*.conf + ) +fi + +# check there is file to load +(( ${#binfmt_d[@]} > 0 )) || exit 1 -# check binfmt_misc filesystem is mounted +# mount binfmt_misc if api filesystem is missing mountpoint -q /proc/sys/fs/binfmt_misc || - { echo "/proc/sys/fs/binfmt_misc is not mounted"; exit 1;} + mount -t binfmt_misc binfmt /proc/sys/fs/binfmt_misc -# files declared later in the sysctl_d array will override earlier -# Example: `/etc/sysctl.d/foo.conf' supersedes `/usr/lib/sysctl.d/foo.conf'. -for path in "${@:-${binfmt_d[@]}}"; do +# files declared later in the binfmt_d array will override earlier +# Example: `/etc/binfmt.d/foo.conf' supersedes `/usr/lib/binfmt.d/foo.conf'. +declare -A fragments +for path in "${binfmt_d[@]}"; do [[ -f $path ]] && fragments[${path##*/}]=$path done diff --git a/rc.sysinit b/rc.sysinit index 9880995..ff0b6d2 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -12,10 +12,8 @@ printhl "${C_H2}http://www.archlinux.org" printsep # mount the api filesystems -# /proc, /proc/sys/fs/binfmt_misc, /sys, /run, /dev, /run/lock, /dev/pts, /dev/shm +# /proc, /sys, /run, /dev, /run/lock, /dev/pts, /dev/shm mountpoint -q /proc || mount -t proc proc /proc -o nosuid,noexec,nodev -mountpoint -q /proc/sys/fs/binfmt_misc || - mount -t binfmt_misc binfmt /proc/sys/fs/binfmt_misc mountpoint -q /sys || mount -t sysfs sys /sys -o nosuid,noexec,nodev mountpoint -q /run || mount -t tmpfs run /run -o mode=0755,nosuid,nodev mountpoint -q /dev || mount -t devtmpfs dev /dev -o mode=0755,nosuid -- Sebastien "Seblu" Luttringer

1 1

Re: [arch-projects] Support additional binary formats at boot
by Tom Gundersen 13 Mar '12

13 Mar '12

2012/3/13 Matthew Monaco <dgbaley27(a)0x01b.net>: > Does this really need to be done automatically? Up until now all of the mounting > that rc.sysinit does is essential. This is definitely optional. Can't it just be > a commented line in fstab in the filesystems package? We might do this in the arch-binfmt tool rather than at boot (and then only if config files are found that needs it). Thoughts anyone? > ( essential except /dev/shm maybe... /dev/shm is needed by glibc > a fstab.d would be nice =/ ) Changing the format of /etc/fstab sounds like a bad idea to me (anyone might read and parse /etc/fstab). There was a recent discussion about this on the util-linux ml, where it was committed and then reverted shortly after due to this concern. -t

1 0

[arch-projects] [initscripts] next release
by Tom Gundersen 13 Mar '12

13 Mar '12

Hi guys, I'm intending to release initscripts soon (once we have emptied testing a bit). That said, there is no hurry so if anyone has any patches they want included, please let me know and I'll wait for them to be ready. Cheers, Tom

3 2

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2012.02.2-15-gb49cc7b
by tomegun＠archlinux.org 13 Mar '12

13 Mar '12

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 b49cc7be1be791318f57d2941999368ae58636b7 (commit) via 9f75591c8a56ba7ec1ea20cfe16dd10a83c65503 (commit) via 788daea5db4445f02fc156132f00829e1107dc6f (commit) via 299c22ad5c124cb62e1ba35447440947fe4afb37 (commit) from cb18be3f401a2c693d66a9417e479ed74e17c2f0 (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 b49cc7be1be791318f57d2941999368ae58636b7 Merge: cb18be3 9f75591 Author: Tom Gundersen <teg(a)jklm.no> Date: Tue Mar 13 15:50:34 2012 +0100 Merge remote-tracking branch 'seblu/master' Conflicts: Makefile commit 9f75591c8a56ba7ec1ea20cfe16dd10a83c65503 Author: Sébastien Luttringer <seblu(a)seblu.net> Date: Mon Mar 12 22:50:42 2012 +0100 Remove NEED_ROOT crap This patch revert patch 042d197b4d989ec64. NEED_ROOT was introduced to fix bug FS#24095. But in fact it doesn't solve it because nobody use it. The idea was to allow initscripts developper to have a check runned by every scripts which tell if scripts need to be run as root (most of them) or not (and the script check itself which part of him have to be run as root). All this to display a cute error message. I think this complexity is superfluous and let part of initscript will fail if rights are not enough. I must confess that we should have marked this bug as wontfix rather than do that. Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> commit 788daea5db4445f02fc156132f00829e1107dc6f Author: Sébastien Luttringer <seblu(a)seblu.net> Date: Mon Mar 12 22:41:11 2012 +0100 Support additional binary formats at boot This patch mount kernel binfmt_misc filesystem at boot and allow loading of a default configuration inspired from systemd binfmt.d way. Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> commit 299c22ad5c124cb62e1ba35447440947fe4afb37 Author: Sébastien Luttringer <seblu(a)seblu.net> Date: Mon Mar 12 22:08:57 2012 +0100 arch-sysctl: allow passing specific config files Modify our path collection loop to accept the remaining argv as paths to config files. This overrides the default lookup for config files in /etc, /lib, and /run so that single config files can be parsed at a time Credits to Dave Reisner in 11ac21c1cf74 Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> ----------------------------------------------------------------------- Summary of changes: Makefile | 4 +++- arch-binfmt | 36 ++++++++++++++++++++++++++++++++++++ arch-sysctl | 2 +- functions | 10 ---------- rc.d | 1 - rc.multi | 3 +++ rc.sysinit | 5 ++++- 7 files changed, 47 insertions(+), 14 deletions(-) create mode 100755 arch-binfmt hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [INITSCRIPTS][PATCH 1/4] localtime copy fix in to rc.conf man page
by Sébastien Luttringer 13 Mar '12

13 Mar '12

set_timezone function currently respect user choice of symlink to timezone file or copy it. man page doesn't explain this subtlety which let think that TIMEZONE parameter in rc.conf doesn't ensure anything. Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> --- rc.conf.5.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc.conf.5.txt b/rc.conf.5.txt index c4087d0..4b452fc 100644 --- a/rc.conf.5.txt +++ b/rc.conf.5.txt @@ -25,7 +25,7 @@ LOCALIZATION[[L]] *TIMEZONE=* Specifies the timezone. The setting takes effect on boot by ensuring that /etc/localtime is a symlink -to the correct zoneinfo file. Possible timezones are the relative path to a zoneinfo file starting +to, or a copy of, the correct zoneinfo file. Possible timezones are the relative path to a zoneinfo file starting from the directory /usr/share/zoneinfo. For example, a German timezone would be Europe/Berlin, which refers to the file /usr/share/zoneinfo/Europe/Berlin. -- Sebastien "Seblu" Luttringer

3 10

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2012.02.2-11-gcb18be3
by tomegun＠archlinux.org 12 Mar '12

12 Mar '12

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 cb18be3f401a2c693d66a9417e479ed74e17c2f0 (commit) via 1b653d6986714848a848b421c50dafe2868829e6 (commit) via 523e05098af3b9233d286a0f31afe7e879bcd6a8 (commit) from 28db00b0def506223ae55f5a7eef0dc94591fe91 (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 cb18be3f401a2c693d66a9417e479ed74e17c2f0 Author: Tom Gundersen <teg(a)jklm.no> Date: Mon Mar 12 23:26:15 2012 +0100 timezone: always symlink to zoneinfo rather than copying Behave as described in the manpage. This makes sure that we don't need to write to /etc unnecessarily in case of updates to zoneinfo. The reason for keeping a copy in /etc was if /usr was on a separate unmounted partition, but this is no longer supported. Reported-by: Sébastien Luttringer <seblu(a)seblu.net> Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit 1b653d6986714848a848b421c50dafe2868829e6 Author: Lukas Fleischer <archlinux(a)cryptocrack.de> Date: Mon Mar 12 14:36:45 2012 +0100 Makefile: Rework man page handling * Move the list of man page files to a variable to avoid code duplication. Also, use generic code in the install target and extract man pages from the newly introduced variable. * Use generic (wildcard) rules for man page generation instead of having one rule per source/target file. * Use "$(DESTDIR)" instead of "${DESTDIR}" everywhere. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> commit 523e05098af3b9233d286a0f31afe7e879bcd6a8 Author: Lukas Fleischer <archlinux(a)cryptocrack.de> Date: Mon Mar 12 14:45:52 2012 +0100 Makefile: Mark phony targets Most targets used in our Makefile don't refer to files. Use the ".PHONY" special target to mark these. Doing this prevents us from file name conflicts and improves performance a bit. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> ----------------------------------------------------------------------- Summary of changes: Makefile | 35 ++++++++++++++++++----------------- functions | 7 +------ 2 files changed, 19 insertions(+), 23 deletions(-) hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] [PATCH 1/2] Makefile: Mark phony targets
by Lukas Fleischer 12 Mar '12

12 Mar '12

Most targets used in our Makefile don't refer to files. Use the ".PHONY" special target to mark these. Doing this prevents us from file name conflicts and improves performance a bit. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 3e83e58..1081730 100644 --- a/Makefile +++ b/Makefile @@ -62,3 +62,5 @@ tar: release: tar scp initscripts-$(VER).tar.xz gerolde.archlinux.org:/srv/ftp/other/initscripts/ scp initscripts-$(VER).tar.xz pkgbuild.com:~/svn-packages/initscripts/trunk/ + +.PHONY: all installdirs install doc clean tar release -- 1.7.9.3

1 1

[arch-projects] (no subject)
by Tom Gundersen 12 Mar '12

12 Mar '12

At some point I'd like to do something like the following patch for the placement of files to make margianlly more sense. Not going to do it in the immediate future (at least not the next release), but i thought I'd put it out there. TL;DR: put initscript files where they belong without breaking compat or requiring user action. Cheers, Tom >From 4bf1959e3d7d27d6c9d824e3ef932902129f3de3 Mon Sep 17 00:00:00 2001 From: Tom Gundersen <teg(a)jklm.no> Date: Mon, 13 Feb 2012 15:20:29 +0100 Subject: [RFC][PATCH] move non-config files out of /etc Place scripts that can be called from the console in /usr/bin, and the rest in /usr/lib/initscripts/. We symlink /etc/rc.d/functions to /usr/lib/initscripts/functions for compatibiliy. On upgrade we also symlink the other scripts, but not on new installs: if [ "$(vercmp $2 2012.0?.1)" -lt 0 ]; then for script in sysinit shutdown single multi; do ln -s "../usr/lib/initscripts/rc.${script}" /etc/ done fi The reason for these symlinks is to avoid issues with people not merging inittab.pacnew. Suggested-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Tom Gundersen <teg(a)jklm.no> --- Makefile | 11 ++++++----- inittab | 8 ++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 3e83e58..425c38b 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ DIRS := \ /etc/rc.d/functions.d \ /etc/logrotate.d \ /etc/profile.d \ - /usr/sbin \ + /usr/bin \ /etc/tmpfiles.d \ /usr/lib/tmpfiles.d \ /etc/sysctl.d \ @@ -23,15 +23,16 @@ installdirs: install: installdirs doc install -m644 -t $(DESTDIR)/etc inittab rc.conf - install -m755 -t $(DESTDIR)/etc rc.local rc.local.shutdown rc.multi rc.shutdown rc.single rc.sysinit + install -m755 -t $(DESTDIR)/etc rc.local rc.local.shutdown install -m644 -t $(DESTDIR)/etc/logrotate.d bootlog - install -m644 -t $(DESTDIR)/etc/rc.d functions install -m755 -t $(DESTDIR)/etc/rc.d hwclock network netfs install -m755 -t $(DESTDIR)/etc/profile.d locale.sh - install -m755 -t $(DESTDIR)/usr/sbin rc.d + install -m755 -t $(DESTDIR)/usr/bin rc.d install -m644 -t ${DESTDIR}/usr/share/man/man8 rc.d.8 install -m644 -t ${DESTDIR}/usr/share/man/man5 rc.conf.5 locale.conf.5 vconsole.conf.5 hostname.5 - install -m755 -t $(DESTDIR)/usr/lib/initscripts arch-tmpfiles arch-sysctl + install -m755 -t $(DESTDIR)/usr/lib/initscripts arch-tmpfiles arch-sysctl rc.multi rc.shutdown rc.single rc.sysinit + install -m644 -t $(DESTDIR)/usr/lib/initscripts functions + ln -s ../../usr/lib/initscripts/functions $(DESTDIR)/etc/rc.d/ install -m644 tmpfiles.conf $(DESTDIR)/usr/lib/tmpfiles.d/arch.conf install -m644 -T bash-completion $(DESTDIR)/etc/bash_completion.d/rc.d install -m644 -T zsh-completion $(DESTDIR)/usr/share/zsh/site-functions/_rc.d diff --git a/inittab b/inittab index a375f59..ebc282d 100644 --- a/inittab +++ b/inittab @@ -17,10 +17,10 @@ id:3:initdefault: # Boot to X11 #id:5:initdefault: -rc::sysinit:/etc/rc.sysinit -rs:S1:wait:/etc/rc.single -rm:2345:wait:/etc/rc.multi -rh:06:wait:/etc/rc.shutdown +rc::sysinit:/usr/lib/initscripts/rc.sysinit +rs:S1:wait:/usr/lib/initscripts/rc.single +rm:2345:wait:/usr/lib/initscripts/rc.multi +rh:06:wait:/usr/lib/initscripts/rc.shutdown su:S:wait:/sbin/sulogin -p # -8 options fixes umlauts problem on login -- 1.7.9.3

5 6

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2012.02.2-8-g28db00b
by tomegun＠archlinux.org 11 Mar '12

11 Mar '12

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 28db00b0def506223ae55f5a7eef0dc94591fe91 (commit) via 9fefe217d5e6dff9415e47e35f855740c11138f9 (commit) via 11ac21c1cf74a428017c6335b7c74cf3cfedeb11 (commit) from bdad979a6f062228c318f0903f3d11c6865c5ff1 (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 28db00b0def506223ae55f5a7eef0dc94591fe91 Merge: bdad979 9fefe21 Author: Tom Gundersen <teg(a)jklm.no> Date: Sun Mar 11 19:29:21 2012 +0100 Merge commit 'falconindy/working^1' commit 9fefe217d5e6dff9415e47e35f855740c11138f9 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Mar 11 13:12:28 2012 -0400 arch-tmpfiles: don't try to resolve numeric UIDs/GIDs The whole point of using numeric IDs is to avoid resolution in the passwd/group databases. If we encounter an ID which is simply numeric, leave it alone. Looks like I broke this in a4558c4c trying to be a bit too clever. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 11ac21c1cf74a428017c6335b7c74cf3cfedeb11 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Mar 9 13:26:49 2012 -0500 arch-tmpfiles: allow passing specific config files Modify our path collection loop to accept the remaining argv as paths to config files. This overrides the default lookup for config files in /etc, /lib, and /run so that single config files can be parsed at a time (e.g. during package installation). Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: arch-tmpfiles | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) hooks/post-receive -- Arch Linux initscripts repository

1 0