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

[arch-projects] [netcfg] Rethink systemd integration v2
by Thomas Bächler 30 Dec '12

30 Dec '12

For net-auto-wired and -wireless, a new @-unit has to be instantiated with the interface name. Static profiles are enabled automatically when listed in /etc/conf.d/network NETWORKS= - the old netcfg.service has thus been removed. This breaks the NETWORKS=(last) functionality, and I don't think we can handle it properly right now. NETWORKS=(menu) could never work with systemd anyway. I'd really like to remove netcfg@.service, net-auto-wired.service and net-auto-wireless.service at some point, but that will break existing setups. I don't know if we should go ahead with this. What we should definitely do is change netcfg, wifi-menu and netcfg-menu to use systemctl to start profiles when called manually. This would ensure systemd can track the profiles properly, knows how to shut them down and can track their processes.

3 16

[arch-projects] [mkinitcpio] 0.12.0 feature release review
by Dave Reisner 03 Dec '12

03 Dec '12

arch-projects has been fairly quietly recently, so here's a patch dump for interested parties to amuse themselves with. This is what I'm looking at merging for the next release. Most of it is fairly innocuous and there's the usual occurences of cleanup and bugfixing, but there's a few things worth explicitly calling out: * I'm merging all of the block device build hooks into a single "block" hook. So previously, if your array had "pata sata scsi" in it, you now can replace all that with "block". Since this will also include things like "usb" and "virtio", there's some nice surprises for people who previously had to add these things explicitly. * Addition of a modconf hook, which will be added by default. Rather than have people explicitly add their modprobe.conf (which is no longer the "right thing" as per upstream, this hook will just add the entirety of /{etc,lib}/modprobe.d to the image. I think this is generally the right thing to do as it would be rare that you want an option in early userspace and not later, and vice versa. * Dropping support for /etc/rc.conf. This means that the keymap and consolefont hooks will no longer read from /etc/rc.conf, but only from /etc/vconsole.conf and /etc/locale.conf. We've been slowly dropping this support in other places, and I think it makes sense to do this here as well. * Dropping support for old hook API. No one should really notice this. I personally did the work to update the hooks in the repos when I introduced the new API several months ago, and I prodded some of the hook authors in the AUR to update. Full shortlog below. Latest patches can always be found at: git://code.falconindy.com/mkinitcpio But I don't expect much to change at this point. Cheers, Dave Dave Reisner (18): shutdown: share dm teardown with lvm shutdown: avoid talking to udev via dmsetup shutdown: copy kexec from host if requested and not available usbinput: use autodetection on newer kernels init: condense early module loading init: use exponential backoff in poll_device init: remove needless workaround for empty rootdelay init: declare defaults earlier init: remove unneeded variable expansion drop support for reading /etc/rc.conf obsolete old-style install hook API build: move manpages to subdir functions: only show the basename of a deprecated hook Makefile: copy directories, not individual files on install merge most storage hooks into a single 'block' hook modconf: add new hook to simply inclusion of modprobe config unique _modpaths arrays in during build selectively decompress modules on install Makefile | 19 ++- functions | 73 ++++-------- init | 14 +-- init_functions | 24 ++-- install/block | 45 +++++++ install/consolefont | 9 +- install/fw | 22 +--- install/keymap | 5 +- install/mmc | 19 +-- install/modconf | 15 +++ install/pata | 22 +--- install/sata | 23 +--- install/scsi | 22 +--- install/usb | 21 +--- install/usbinput | 15 ++- install/virtio | 16 +-- lsinitcpio.1.txt | 68 ----------- man/lsinitcpio.1.txt | 68 +++++++++++ man/mkinitcpio.8.txt | 297 +++++++++++++++++++++++++++++++++++++++++++++ man/mkinitcpio.conf.5.txt | 82 +++++++++++++ mkinitcpio | 38 ++++-- mkinitcpio.8.txt | 298 ---------------------------------------------- mkinitcpio.conf | 17 +-- mkinitcpio.conf.5.txt | 82 ------------- shutdown | 30 +++-- 25 files changed, 637 insertions(+), 707 deletions(-) create mode 100644 install/block mode change 100644 => 120000 install/fw mode change 100644 => 120000 install/mmc create mode 100644 install/modconf mode change 100644 => 120000 install/pata mode change 100644 => 120000 install/sata mode change 100644 => 120000 install/scsi mode change 100644 => 120000 install/usb mode change 100644 => 120000 install/virtio delete mode 100644 lsinitcpio.1.txt create mode 100644 man/lsinitcpio.1.txt create mode 100644 man/mkinitcpio.8.txt create mode 100644 man/mkinitcpio.conf.5.txt delete mode 100644 mkinitcpio.8.txt delete mode 100644 mkinitcpio.conf.5.txt -- 1.8.0

3 20

[arch-projects] [mkinitcpio][PATCH v3] [WIP] systemd: add systemd hook and needed files
by Tom Gundersen 28 Nov '12

28 Nov '12

Note: generate initramfs with HOOKS=('systemd' 'block' 'fsck') This is based on dracut, but with all the glue-scripts removed. It relies on patches posted to the systemd ML to support root= and init= natively, as well as current systemd git to avoid a cycle in /shutdown. Idea is: * start systemd/udevd/journald * wait for the root device to appear * mount the rootfs * isolate the switch-root target * this shuts down/cleans up everything * then copies the initramfs to /run/initramfs (for the shutdown hook) * then calls systemctl to switch to the new root and reexec systemd TODO: * include more systemd units and helpers, should reveiw them all * discuss with dracut/systemd people the possibility of putting something like this in the systemd repo so we don't have to duplicate work * write a separate 'debug' hook, including emergency.service++ --- v3: incorporate shutdown hook and clean up a bit Makefile | 11 ++++++ install/systemd | 65 ++++++++++++++++++++++++++++++++++ systemd/initrd-pre-switch-root.service | 20 +++++++++++ systemd/initrd-switch-root.service | 21 +++++++++++ systemd/initrd-switch-root.target | 17 +++++++++ systemd/udevadm-cleanup-db.service | 18 ++++++++++ 6 files changed, 152 insertions(+) create mode 100644 install/systemd create mode 100644 systemd/initrd-pre-switch-root.service create mode 100644 systemd/initrd-switch-root.service create mode 100644 systemd/initrd-switch-root.target create mode 100644 systemd/udevadm-cleanup-db.service diff --git a/Makefile b/Makefile index 88f82db..93289b5 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,8 @@ DIRS = \ /usr/lib/initcpio/hooks \ /usr/lib/initcpio/install \ /usr/lib/initcpio/udev \ + /usr/lib/systemd/system \ + /usr/lib/systemd/generators \ /usr/share/man/man8 \ /usr/share/man/man5 \ /usr/share/man/man1 @@ -43,6 +45,15 @@ install: all install -m644 -t $(DESTDIR)/usr/lib/initcpio init_functions functions install -m644 01-memdisk.rules $(DESTDIR)/usr/lib/initcpio/udev/01-memdisk.rules + install -m644 systemd/initrd-pre-switch-root.service \ + $(DESTDIR)/usr/lib/systemd/system/initrd-pre-switch-root.service + install -m644 systemd/initrd-switch-root.service \ + $(DESTDIR)/usr/lib/systemd/system/initrd-switch-root.service + install -m644 systemd/udevadm-cleanup-db.service \ + $(DESTDIR)/usr/lib/systemd/system/udevadm-cleanup-db.service + install -m644 systemd/initrd-switch-root.target \ + $(DESTDIR)/usr/lib/systemd/system/initrd-switch-root.target + cp -at $(DESTDIR)/usr/lib/initcpio/hooks hooks/* cp -at $(DESTDIR)/usr/lib/initcpio/install install/* cp -at $(DESTDIR)/etc/mkinitcpio.d mkinitcpio.d/* diff --git a/install/systemd b/install/systemd new file mode 100644 index 0000000..9a2c887 --- /dev/null +++ b/install/systemd @@ -0,0 +1,65 @@ +#!/bin/bash + +build() { + local rules tool socket service + + # from base + add_binary /usr/bin/kmod + add_symlink /usr/bin/modprobe kmod + add_binary /bin/mount + + # systemd + add_binary /usr/lib/systemd/systemd /init + add_binary /usr/bin/systemctl + add_binary /usr/bin/udevadm + add_binary /usr/lib/systemd/systemd-udevd + add_binary /usr/lib/systemd/systemd-journald + + # shutdown + add_binary /usr/bin/cp + add_binary /usr/lib/systemd/systemd-shutdown /shutdown + + # generate new_root.mount + add_file "/usr/lib/systemd/system-generators/systemd-fstab-generator" + + # needed by libdbus, maybe it should be patched to special-case uid=0 and avoid the dep? + add_file "/lib/libnss_files-2.16.so" + add_symlink "/lib/libnss_files.so" "libnss_files.so.2" + add_symlink "/lib/libnss_files.so.2" "libnss_files-2.16.so" + + # udev rules and systemd units + for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules 99-systemd.rules; do + add_file "/usr/lib/udev/rules.d/$rules" + done + for tool in ata_id scsi_id; do + add_file "/usr/lib/udev/$tool" + done + for socket in systemd-udevd-control systemd-udevd-kernel systemd-journald; do + add_file "/usr/lib/systemd/system/$socket.socket" + add_symlink "/usr/lib/systemd/system/sockets.target.wants/$socket.socket" "../$socket.socket" + done + for service in systemd-udevd systemd-udev-trigger systemd-journald; do + add_file "/usr/lib/systemd/system/$service.service" + add_symlink "/usr/lib/systemd/system/sysinit.target.wants/$service.service" "../$service.service" + done + for target in sysinit sockets basic emergency local-fs local-fs-pre remote-fs remote-fs-pre ctrl-alt-del initrd-switch-root; do + add_file "/usr/lib/systemd/system/$target.target" + done + + add_file "/usr/lib/systemd/system/systemd-fsck@.service" + add_file "/usr/lib/systemd/system/initrd-switch-root.service" + add_file "/usr/lib/systemd/system/systemd-reboot.service" + add_symlink "/usr/lib/systemd/system/initrd-switch-root.target.wants/initrd-switch-root.service" "../initrd-switch-root.service" + add_file "/usr/lib/systemd/system/initrd-pre-switch-root.service" + add_symlink "/usr/lib/systemd/system/basic.target.wants/initrd-pre-switch-root.service" "../initrd-pre-switch-root.service" + + add_symlink "/usr/lib/systemd/system/default.target" "basic.target" +} + +help() { + cat <<HELPEOF +This will install a basic systemd setup on your initrd, you might want to add more hooks to get more advanced functionality. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/systemd/initrd-pre-switch-root.service b/systemd/initrd-pre-switch-root.service new file mode 100644 index 0000000..516be94 --- /dev/null +++ b/systemd/initrd-pre-switch-root.service @@ -0,0 +1,20 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +# See systemd.special(7) for details + +[Unit] +Description=Waiting for new root device to appear +DefaultDependencies=no +Requires=new_root.mount +After=new_root.mount +OnFailure=emergency.target +ConditionPathExists=/etc/initrd-release + +[Service] +Type=oneshot +ExecStart=/usr/bin/systemctl --no-block isolate initrd-switch-root.target diff --git a/systemd/initrd-switch-root.service b/systemd/initrd-switch-root.service new file mode 100644 index 0000000..84d706f --- /dev/null +++ b/systemd/initrd-switch-root.service @@ -0,0 +1,21 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Switch Root +DefaultDependencies=no +ConditionPathExists=/etc/initrd-release +OnFailure=emergency.target +After=initrd-switch-root.target new_root.mount +AllowIsolate=yes + +[Service] +Type=oneshot +# we have to use "--force" here, otherwise systemd would umount /run +ExecStartPre=/bin/cp -ax / /run/initramfs +ExecStart=/usr/bin/systemctl --no-block --force switch-root /new_root +KillMode=none diff --git a/systemd/initrd-switch-root.target b/systemd/initrd-switch-root.target new file mode 100644 index 0000000..74647a5 --- /dev/null +++ b/systemd/initrd-switch-root.target @@ -0,0 +1,17 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +# See systemd.special(7) for details + +[Unit] +Description=Switch Root +DefaultDependencies=no +Requires=initrd-switch-root.service +Before=initrd-switch-root.service +AllowIsolate=yes +Wants=systemd-journald.service +ConditionPathExists=/etc/initrd-release diff --git a/systemd/udevadm-cleanup-db.service b/systemd/udevadm-cleanup-db.service new file mode 100644 index 0000000..983189e --- /dev/null +++ b/systemd/udevadm-cleanup-db.service @@ -0,0 +1,18 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Cleanup udevd DB +DefaultDependencies=no +ConditionPathExists=/etc/initrd-release +Conflicts=systemd-udevd.service systemd-udevd-control.socket systemd-udevd-kernel.socket +After=systemd-udevd.service systemd-udevd-control.socket systemd-udevd-kernel.socket +Before=initrd-switch-root.target + +[Service] +Type=oneshot +ExecStart=-/usr/bin/udevadm info --cleanup-db -- 1.8.0.1

1 0

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.11.2-23-g47b5d5e
by dreisner＠archlinux.org 28 Nov '12

28 Nov '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 "The official mkinitcpio repository". The branch, master has been updated via 47b5d5ef4eb6c2803e61890949fd7e9ab2164796 (commit) via 5bce429b600c6ae7443b7c6c0d8d3133e01ee091 (commit) via 8155250bcdce4737a0fdb1d3009d9878f61ee324 (commit) via 78fb526649cc730d9c20be47112db945a4a8427b (commit) via b9d81a088ad0aa694b335118cf4ee70ad3ad1712 (commit) via d64243de39f6d76edf8150b1d81d586345758fed (commit) via 91ea008b715fb6697517e678e5e1b13971a76157 (commit) via 56cda33a8cdfd3f11803cd8f7bd79be15f6ca23f (commit) via 97368c0e78f3a4fe4d62f7aedde88d4be13bfdba (commit) via eac33ad291fe89bb3e157c2ca8e0d8c152ab8f37 (commit) via 8b19be5a9fda9da678166d93a4ccc800f80614dd (commit) via 3c961b3bc3cbffa7537575c8ea85d016a0342f24 (commit) via f85d28014134076217904885ea339e2f4c438df1 (commit) via ac8499c08279b05dc582cc65d9e73deda5d38572 (commit) via a3889c6914f7fac5a5b7a438be4233bcf66db44c (commit) via e8f0c1226fbf87d3be711a36693c30ed7745e45d (commit) via 4976072037baede0faeaf94362e282f26f19d6af (commit) via 42c01012e85646706bf11042cc0952d47d9236d0 (commit) via 1603e30f49347525dfcc999e3c63cb27cb54dde8 (commit) via 826562e35278faa7c40b3b78a5d51223bee28d00 (commit) via 70f54ce9e6898d0f28a6b1d2911eb82ce902d429 (commit) via 1fc9e188c81204d57715dfd2916737b3e824f43d (commit) via 4fd768957e6fae85e4019ff7621693e0683eab84 (commit) from 368745497880f5ad4485df002ea7511b34a1c237 (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 47b5d5ef4eb6c2803e61890949fd7e9ab2164796 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Nov 25 20:15:35 2012 -0500 functions: always return successfully if we ran a build hook Removal of the old API (f85d28014134076) exposed the fact that a build hook returning an error would increment the builderrors. This isn't really wanted -- we don't want to declare a hard "pass/fail" for a hook, as the functions we actually care about passing/failing are the add_* functions which are of real concern (and already caught). Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 5bce429b600c6ae7443b7c6c0d8d3133e01ee091 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Nov 25 00:14:59 2012 -0500 lsinitcpio: use compound command for parseopts exec Pedantic, but at least this makes us consistent with mkinitcpio. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 8155250bcdce4737a0fdb1d3009d9878f61ee324 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Nov 24 21:21:56 2012 -0500 handle deprecation notices in -H and -L Separate out the printing from these flags to separate functions and examine each hook more closely, pointing out where it might be deprecated, and what should be used in place of it. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 78fb526649cc730d9c20be47112db945a4a8427b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Nov 24 20:39:46 2012 -0500 replace find_in_dirs with PATH= manipulation Declaring our lookup paths like normal colon delimited PATHs lets us reuse them for builtins like source and type to do the same work that this function previously did. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit b9d81a088ad0aa694b335118cf4ee70ad3ad1712 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Nov 24 10:37:29 2012 -0500 shutdown: teardown loop devices only after umount This still isn't really ideal, but attempting to detach loops while they're still mounted will definitely fail. Ideally, the loop device is in autoclear mode and dropping its refcount to 0 on umount will cause the backing file to be detached from the loop. Of course, this all gets way too complicated for userspace to handle when dealing with the sort of rat's nest of loop devices that ArchISO sets up. The kernel doesn't help us out here by populating things like holders/ and slaves/, but I'm not sure it could. Maybe there's a better way... Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit d64243de39f6d76edf8150b1d81d586345758fed Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Nov 23 15:31:56 2012 -0500 selectively decompress modules on install Don't make any assumptions about the compression on modules and scan the passed in module list for telltale extensions. This has the benefit of doing nothing when modules are uncompressed, and adds support for decompression of XZ modules. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 91ea008b715fb6697517e678e5e1b13971a76157 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Nov 23 12:37:58 2012 -0500 unique _modpaths arrays in during build Declaring _modpaths as an associative array allows us to forego the printf|sort -u|xargs cp pipeline as we can guarantee that the array is already prepared. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 56cda33a8cdfd3f11803cd8f7bd79be15f6ca23f Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Nov 22 16:41:50 2012 -0500 modconf: add new hook to simply inclusion of modprobe config Add this as a default in the config file. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 97368c0e78f3a4fe4d62f7aedde88d4be13bfdba Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Oct 5 21:09:30 2012 -0400 merge most storage hooks into a single 'block' hook As the autodetect hook gets better with every kernel release, we can "afford" to remove the needless segregation of block device driver hooks and simply merge all the "vanilla" or "unstacked" block device drivers. This should make a lot of setups, like usb or virtio, easier as you won't need to remember to add the hook. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit eac33ad291fe89bb3e157c2ca8e0d8c152ab8f37 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Nov 20 10:54:53 2012 -0500 Makefile: copy directories, not individual files on install This allow preservation of symlinks. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 8b19be5a9fda9da678166d93a4ccc800f80614dd Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Nov 22 12:15:26 2012 -0500 functions: only show the basename of a deprecated hook Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 3c961b3bc3cbffa7537575c8ea85d016a0342f24 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Nov 22 17:29:48 2012 -0500 build: move manpages to subdir Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit f85d28014134076217904885ea339e2f4c438df1 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Nov 18 21:32:46 2012 -0500 obsolete old-style install hook API This removes any meaning from the definitions of MODULES, BINARIES, FILES, and SCRIPT within install hooks. It also removed the deprecated checked_modules() function, which is replaced by add_checked_modules(). Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit ac8499c08279b05dc582cc65d9e73deda5d38572 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Nov 14 19:55:00 2012 -0500 drop support for reading /etc/rc.conf Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit a3889c6914f7fac5a5b7a438be4233bcf66db44c Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Nov 18 18:51:50 2012 -0500 init: remove unneeded variable expansion Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit e8f0c1226fbf87d3be711a36693c30ed7745e45d Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Nov 18 11:38:55 2012 -0500 init: declare defaults earlier Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 4976072037baede0faeaf94362e282f26f19d6af Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Nov 17 19:29:44 2012 -0500 init: remove needless workaround for empty rootdelay Adjust the test in poll_device to look for either an unset OR an empty 2nd parameter. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 42c01012e85646706bf11042cc0952d47d9236d0 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Oct 31 21:57:48 2012 -0400 init: use exponential backoff in poll_device Start at .1 second and double the interval, capping at 1s. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 1603e30f49347525dfcc999e3c63cb27cb54dde8 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Nov 1 16:39:55 2012 -0400 init: condense early module loading Since mkinitcpio rewrites its runtime config, we can guarantee that these variable are sanitized of extraneous whitespace. Meld the two calls together, ensuring that we retain the ordering, but only call modprobe once. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 826562e35278faa7c40b3b78a5d51223bee28d00 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Nov 10 10:39:29 2012 -0500 usbinput: use autodetection on newer kernels This is a partial "revert" of 822a88700e since kernels as of 3.5 add module aliases for hid devices. Fixes FS#32575. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 70f54ce9e6898d0f28a6b1d2911eb82ce902d429 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Nov 16 09:51:25 2012 -0500 shutdown: copy kexec from host if requested and not available Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 1fc9e188c81204d57715dfd2916737b3e824f43d Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Nov 16 23:01:22 2012 -0500 shutdown: avoid talking to udev via dmsetup Similar to c257b0d7b4dd. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 4fd768957e6fae85e4019ff7621693e0683eab84 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Nov 15 10:31:27 2012 -0500 shutdown: share dm teardown with lvm lvm is a chatty bitch and wants to tell all its friends about what it's doing. Mostly this just goes poorly with udev, but now its lvmetad as well. Use dmsetup as a shortcut and just tear down the volumes without worrying about the needless accounting. Guys? GUYS?!?! GUYS IM TEARING STUFF DOWN NOW!!!11!!!111 Fixes FS#32680. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile | 23 ++-- functions | 87 +++++-------- init | 14 +- init_functions | 24 +++- install/block | 45 +++++++ install/consolefont | 9 +- install/fw | 22 +--- install/keymap | 5 +- install/mmc | 19 +-- install/modconf | 15 +++ install/pata | 22 +--- install/sata | 23 +--- install/scsi | 22 +--- install/usb | 21 +-- install/usbinput | 15 ++- install/virtio | 16 +-- lsinitcpio | 4 +- lsinitcpio.1.txt => man/lsinitcpio.1.txt | 0 mkinitcpio.8.txt => man/mkinitcpio.8.txt | 3 +- mkinitcpio.conf.5.txt => man/mkinitcpio.conf.5.txt | 0 mkinitcpio | 144 +++++++++++++++------ mkinitcpio.conf | 17 +-- shutdown | 42 +++--- 23 files changed, 291 insertions(+), 301 deletions(-) create mode 100644 install/block mode change 100644 => 120000 install/fw mode change 100644 => 120000 install/mmc create mode 100644 install/modconf mode change 100644 => 120000 install/pata mode change 100644 => 120000 install/sata mode change 100644 => 120000 install/scsi mode change 100644 => 120000 install/usb mode change 100644 => 120000 install/virtio rename lsinitcpio.1.txt => man/lsinitcpio.1.txt (100%) rename mkinitcpio.8.txt => man/mkinitcpio.8.txt (98%) rename mkinitcpio.conf.5.txt => man/mkinitcpio.conf.5.txt (100%) hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [mkinitcpio][PATCH v2] [WIP] systemd: add systemd hook and needed files
by Tom Gundersen 28 Nov '12

28 Nov '12

Note: generate initramfs with HOOKS=('systemd' 'block' 'fsck') This is based on dracut, but with all the glue-scripts removed. It relies on patches against systemd to support root= and init= natively. Idea is: * start systemd/udevd/journald * wait for the root device to appear * mount the rootfs * isolate the switch-root target * this shuts down/cleans up everything * then calls systemctl to switch to the new root and reexec systemd TODO: * include more systemd units and helpers, should reveiw them all * discuss with dracut/systemd people the possibility of putting something like this in the systemd repo so we don't have to duplicate work --- v2: move init=/root= parsing into systemd patches, no longer depend on the base hook Makefile | 11 +++++ install/systemd | 73 ++++++++++++++++++++++++++++++++++ systemd/initrd-pre-switch-root.service | 20 ++++++++++ systemd/initrd-switch-root.service | 20 ++++++++++ systemd/initrd-switch-root.target | 17 ++++++++ systemd/udevadm-cleanup-db.service | 18 +++++++++ 6 files changed, 159 insertions(+) create mode 100644 install/systemd create mode 100644 systemd/initrd-pre-switch-root.service create mode 100644 systemd/initrd-switch-root.service create mode 100644 systemd/initrd-switch-root.target create mode 100644 systemd/udevadm-cleanup-db.service diff --git a/Makefile b/Makefile index 88f82db..93289b5 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,8 @@ DIRS = \ /usr/lib/initcpio/hooks \ /usr/lib/initcpio/install \ /usr/lib/initcpio/udev \ + /usr/lib/systemd/system \ + /usr/lib/systemd/generators \ /usr/share/man/man8 \ /usr/share/man/man5 \ /usr/share/man/man1 @@ -43,6 +45,15 @@ install: all install -m644 -t $(DESTDIR)/usr/lib/initcpio init_functions functions install -m644 01-memdisk.rules $(DESTDIR)/usr/lib/initcpio/udev/01-memdisk.rules + install -m644 systemd/initrd-pre-switch-root.service \ + $(DESTDIR)/usr/lib/systemd/system/initrd-pre-switch-root.service + install -m644 systemd/initrd-switch-root.service \ + $(DESTDIR)/usr/lib/systemd/system/initrd-switch-root.service + install -m644 systemd/udevadm-cleanup-db.service \ + $(DESTDIR)/usr/lib/systemd/system/udevadm-cleanup-db.service + install -m644 systemd/initrd-switch-root.target \ + $(DESTDIR)/usr/lib/systemd/system/initrd-switch-root.target + cp -at $(DESTDIR)/usr/lib/initcpio/hooks hooks/* cp -at $(DESTDIR)/usr/lib/initcpio/install install/* cp -at $(DESTDIR)/etc/mkinitcpio.d mkinitcpio.d/* diff --git a/install/systemd b/install/systemd new file mode 100644 index 0000000..ef20b69 --- /dev/null +++ b/install/systemd @@ -0,0 +1,73 @@ +#!/bin/bash + +build() { + local rules tool socket service + + # from base + add_binary /usr/bin/kmod + add_symlink /usr/bin/modprobe kmod + add_binary /bin/mount + + add_binary /usr/lib/systemd/systemd /init + add_binary /usr/bin/systemctl + add_binary /bin/mount + add_binary /usr/bin/udevadm + add_binary /usr/lib/systemd/systemd-udevd + add_binary /usr/lib/systemd/systemd-journald + # for debugging + add_binary /usr/bin/journalctl + add_binary /bin/bash + add_symlink /bin/sh bash + add_binary /sbin/sulogin + + for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules 99-systemd.rules; do + add_file "/usr/lib/udev/rules.d/$rules" + done + for tool in ata_id scsi_id; do + add_file "/usr/lib/udev/$tool" + done + for socket in systemd-udevd-control systemd-udevd-kernel systemd-journald; do + add_file "/usr/lib/systemd/system/$socket.socket" + add_symlink "/usr/lib/systemd/system/sockets.target.wants/$socket.socket" "../$socket.socket" + done + for service in systemd-udevd systemd-udev-trigger systemd-journald; do + add_file "/usr/lib/systemd/system/$service.service" + add_symlink "/usr/lib/systemd/system/sysinit.target.wants/$service.service" "../$service.service" + done + for target in sysinit sockets basic emergency local-fs local-fs-pre remote-fs remote-fs-pre ctrl-alt-del initrd-switch-root; do + add_file "/usr/lib/systemd/system/$target.target" + done + + add_file "/usr/lib/systemd/system-generators/systemd-fstab-generator" + + # wtf? + add_file "/etc/passwd" + add_file "/etc/shadow" + add_file "/etc/group" + add_file "/etc/gshadow" + add_file "/etc/nsswitch.conf" + # (wtf?)^2 + add_file "/lib/libnss_files-2.16.so" + add_symlink "/lib/libnss_files.so" "libnss_files.so.2" + add_symlink "/lib/libnss_files.so.2" "libnss_files-2.16.so" + + + add_file "/usr/lib/systemd/system/systemd-fsck@.service" + add_file "/usr/lib/systemd/system/initrd-switch-root.service" + add_file "/usr/lib/systemd/system/systemd-reboot.service" + add_symlink "/usr/lib/systemd/system/initrd-switch-root.target.wants/initrd-switch-root.service" "../initrd-switch-root.service" + add_file "/usr/lib/systemd/system/initrd-pre-switch-root.service" + add_symlink "/usr/lib/systemd/system/basic.target.wants/initrd-pre-switch-root.service" "../initrd-pre-switch-root.service" + add_file "/usr/lib/systemd/system/emergency.service" + add_symlink "/usr/lib/systemd/system/emergency.target.wants/emergency.service" "../emergency.service" + + add_symlink "/usr/lib/systemd/system/default.target" "basic.target" +} + +help() { + cat <<HELPEOF +This will install a basic systemd setup on your initrd, you might want to add more hooks to get more advanced functionality. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/systemd/initrd-pre-switch-root.service b/systemd/initrd-pre-switch-root.service new file mode 100644 index 0000000..516be94 --- /dev/null +++ b/systemd/initrd-pre-switch-root.service @@ -0,0 +1,20 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +# See systemd.special(7) for details + +[Unit] +Description=Waiting for new root device to appear +DefaultDependencies=no +Requires=new_root.mount +After=new_root.mount +OnFailure=emergency.target +ConditionPathExists=/etc/initrd-release + +[Service] +Type=oneshot +ExecStart=/usr/bin/systemctl --no-block isolate initrd-switch-root.target diff --git a/systemd/initrd-switch-root.service b/systemd/initrd-switch-root.service new file mode 100644 index 0000000..745fb14 --- /dev/null +++ b/systemd/initrd-switch-root.service @@ -0,0 +1,20 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Switch Root +DefaultDependencies=no +ConditionPathExists=/etc/initrd-release +OnFailure=emergency.target +After=initrd-switch-root.target new_root.mount +AllowIsolate=yes + +[Service] +Type=oneshot +# we have to use "--force" here, otherwise systemd would umount /run +ExecStart=/usr/bin/systemctl --no-block --force switch-root /new_root +KillMode=none diff --git a/systemd/initrd-switch-root.target b/systemd/initrd-switch-root.target new file mode 100644 index 0000000..74647a5 --- /dev/null +++ b/systemd/initrd-switch-root.target @@ -0,0 +1,17 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +# See systemd.special(7) for details + +[Unit] +Description=Switch Root +DefaultDependencies=no +Requires=initrd-switch-root.service +Before=initrd-switch-root.service +AllowIsolate=yes +Wants=systemd-journald.service +ConditionPathExists=/etc/initrd-release diff --git a/systemd/udevadm-cleanup-db.service b/systemd/udevadm-cleanup-db.service new file mode 100644 index 0000000..983189e --- /dev/null +++ b/systemd/udevadm-cleanup-db.service @@ -0,0 +1,18 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Cleanup udevd DB +DefaultDependencies=no +ConditionPathExists=/etc/initrd-release +Conflicts=systemd-udevd.service systemd-udevd-control.socket systemd-udevd-kernel.socket +After=systemd-udevd.service systemd-udevd-control.socket systemd-udevd-kernel.socket +Before=initrd-switch-root.target + +[Service] +Type=oneshot +ExecStart=-/usr/bin/udevadm info --cleanup-db -- 1.8.0.1

3 7

[arch-projects] [dbscripts] [GIT] Official repo DB scripts branch nymeria updated. 20121003-4-g1609e48
by pierre＠archlinux.org 25 Nov '12

25 Nov '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 "Official repo DB scripts". The branch, nymeria has been updated via 1609e48d3301dfc2c897ed22d413eb74260b6f4b (commit) from 868adfa4049fcb136d8b7aaaa347b9ffd918c7b9 (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 1609e48d3301dfc2c897ed22d413eb74260b6f4b Author: Pierre Schmitz <pierre(a)archlinux.de> Date: Sun Nov 25 11:52:33 2012 +0100 Fix sourceballs permissions ----------------------------------------------------------------------- Summary of changes: cron-jobs/sourceballs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Official repo DB scripts

1 0

[arch-projects] [mkinitcpio][PATCH] [WIP] systemd: add systemd hook and needed files
by Tom Gundersen 22 Nov '12

22 Nov '12

This is based on dracut, but with all the glue-scripts removed. Idea is: * start systemd/udevd/journald * wait for the root device to appear * mount the rootfs * isolate the switch-root target * this shuts down/cleans up everything * then calls systemctl to switch to the new root and reexec systemd Note: generate initramfs with HOOKS=('base' 'fsck' 'systemd') to get all the needed binaries (such as mount and fsck and busybox for debugging). TODO: * patch systemctl to read init= from /proc/cmdline if it is not given as an argument to switch-root (now it always reexecs systemd) * make a rootfs-mount-from-proc-cmdline generator instead of a hardcoded new_root.mount * include more systemd units and helpers, should reveiw them all * discuss with dracut/systemd people the possibility of putting something like this in the systemd repo so we don't have to duplicate work --- initrd-pre-switch-root.service | 19 ++++++++++++ initrd-switch-root.service | 20 +++++++++++++ initrd-switch-root.target | 16 ++++++++++ install/systemd | 68 ++++++++++++++++++++++++++++++++++++++++++ new_root.mount | 15 ++++++++++ udevadm-cleanup-db.service | 18 +++++++++++ 6 files changed, 156 insertions(+) create mode 100644 initrd-pre-switch-root.service create mode 100644 initrd-switch-root.service create mode 100644 initrd-switch-root.target create mode 100644 install/systemd create mode 100644 new_root.mount create mode 100644 udevadm-cleanup-db.service diff --git a/initrd-pre-switch-root.service b/initrd-pre-switch-root.service new file mode 100644 index 0000000..ae6a731 --- /dev/null +++ b/initrd-pre-switch-root.service @@ -0,0 +1,19 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +# See systemd.special(7) for details + +[Unit] +Description=Waiting for new root device to appear +DefaultDependencies=no +Requires=new_root.mount +After=new_root.mount +ConditionPathExists=/etc/initrd-release + +[Service] +Type=oneshot +ExecStart=/usr/bin/systemctl --no-block isolate initrd-switch-root.target diff --git a/initrd-switch-root.service b/initrd-switch-root.service new file mode 100644 index 0000000..03ff9a8 --- /dev/null +++ b/initrd-switch-root.service @@ -0,0 +1,20 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Switch Root +DefaultDependencies=no +ConditionPathExists=/etc/initrd-release +OnFailure=emergency.service +After=initrd-switch-root.target new_root.mount +AllowIsolate=yes + +[Service] +Type=oneshot +# we have to use "--force" here, otherwise systemd would umount /run +ExecStart=/usr/bin/systemctl --no-block --force switch-root /new_root +KillMode=none diff --git a/initrd-switch-root.target b/initrd-switch-root.target new file mode 100644 index 0000000..fd23908 --- /dev/null +++ b/initrd-switch-root.target @@ -0,0 +1,16 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +# See systemd.special(7) for details + +[Unit] +Description=Switch Root +DefaultDependencies=no +Requires=initrd-switch-root.service +Before=initrd-switch-root.service +AllowIsolate=yes +ConditionPathExists=/etc/initrd-release diff --git a/install/systemd b/install/systemd new file mode 100644 index 0000000..9b38bdf --- /dev/null +++ b/install/systemd @@ -0,0 +1,68 @@ +#!/bin/bash + +build() { + local rules tool socket service + + add_binary /usr/lib/systemd/systemd /init + add_binary /usr/bin/systemctl + add_binary /bin/mount + add_binary /usr/bin/udevadm + add_binary /usr/lib/systemd/systemd-udevd + add_binary /usr/lib/systemd/systemd-journald + # for debugging + add_binary /bin/bash + add_binary /usr/bin/journalctl + + for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules 99-systemd.rules; do + add_file "/usr/lib/udev/rules.d/$rules" + done + for tool in ata_id scsi_id; do + add_file "/usr/lib/udev/$tool" + done + for socket in systemd-udevd-control systemd-udevd-kernel systemd-journald; do + add_file "/usr/lib/systemd/system/$socket.socket" + add_symlink "/usr/lib/systemd/system/sockets.target.wants/$socket.socket" "../$socket.socket" + done + for service in systemd-udevd systemd-udev-trigger systemd-journald debug-shell; do + add_file "/usr/lib/systemd/system/$service.service" + add_symlink "/usr/lib/systemd/system/sysinit.target.wants/$service.service" "../$service.service" + done + for target in sysinit sockets basic local-fs local-fs-pre remote-fs remote-fs-pre initrd-switch-root; do + add_file "/usr/lib/systemd/system/$target.target" + done + + # wtf? + add_file "/etc/passwd" + add_file "/etc/shadow" + add_file "/etc/group" + add_file "/etc/gshadow" + add_file "/etc/nsswitch.conf" + # (wtf?)^2 + add_file "/lib/libnsl-2.16.so" + add_symlink "/lib/libnsl.so" "libnsl.so.1" + add_symlink "/lib/libnsl.so.1" "libnsl-2.16.so" + add_file "/lib/libnss_files-2.16.so" + add_symlink "/lib/libnss_files.so" "libnss_files.so.2" + add_symlink "/lib/libnss_files.so.2" "libnss_files-2.16.so" + + + add_file "/usr/lib/systemd/system/systemd-fsck@.service" + add_file "/usr/lib/systemd/system/initrd-switch-root.service" + add_symlink "/usr/lib/systemd/system/initrd-switch-root.target.wants/initrd-switch-root.service" "../initrd-switch-root.service" + add_file "/usr/lib/systemd/system/initrd-pre-switch-root.service" + add_symlink "/usr/lib/systemd/system/basic.target.wants/initrd-pre-switch-root.service" "../initrd-pre-switch-root.service" + + add_symlink "/usr/lib/systemd/system/default.target" "basic.target" + + # this should be done by a generator (based on /proc/cmdline), and not be hardcoded for my machine... + add_file "/usr/lib/systemd/system/new_root.mount" + add_symlink "/usr/lib/systemd/system/local-fs.target.wants/new_root.mount" "../new_root.mount" +} + +help() { + cat <<HELPEOF +This will install a basic systemd setup on your initrd, you might want to add more hooks to get more advanced functionality. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/new_root.mount b/new_root.mount new file mode 100644 index 0000000..9cb8338 --- /dev/null +++ b/new_root.mount @@ -0,0 +1,15 @@ +# Automatically generated by systemd-root-proc-cmdline-generator + +[Unit] +SourcePath=/proc/cmdline +DefaultDependencies=no +After=local-fs-pre.target +Wants=local-fs-pre.target +Before=local-fs.target + +[Mount] +What=/dev/sda3 +Where=/new_root +Type=btrfs +FsckPassNo=0 +Options=defaults diff --git a/udevadm-cleanup-db.service b/udevadm-cleanup-db.service new file mode 100644 index 0000000..983189e --- /dev/null +++ b/udevadm-cleanup-db.service @@ -0,0 +1,18 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Cleanup udevd DB +DefaultDependencies=no +ConditionPathExists=/etc/initrd-release +Conflicts=systemd-udevd.service systemd-udevd-control.socket systemd-udevd-kernel.socket +After=systemd-udevd.service systemd-udevd-control.socket systemd-udevd-kernel.socket +Before=initrd-switch-root.target + +[Service] +Type=oneshot +ExecStart=-/usr/bin/udevadm info --cleanup-db -- 1.8.0

2 2

[arch-projects] [abs] [PATCH 1/2] Remove Vim modelines in prototype files
by Jason St. John 18 Nov '12

18 Nov '12

From: "Jason St. John" <jstjohn(a)purdue.edu> It makes little sense to "force" users to replace tabs with spaces, with a width of 2. These settings should be configured by the user in their own ~/.vimrc. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- prototypes/PKGBUILD-bzr.proto | 2 -- prototypes/PKGBUILD-cvs.proto | 2 -- prototypes/PKGBUILD-darcs.proto | 2 -- prototypes/PKGBUILD-git.proto | 2 -- prototypes/PKGBUILD-gnome.proto | 2 -- prototypes/PKGBUILD-haskell.proto | 2 -- prototypes/PKGBUILD-hg.proto | 2 -- prototypes/PKGBUILD-perl.proto | 2 -- prototypes/PKGBUILD-python.proto | 2 -- prototypes/PKGBUILD-rubygem.proto | 2 -- prototypes/PKGBUILD-svn.proto | 2 -- prototypes/proto-gnome.install | 2 -- prototypes/proto-haskell.install | 2 -- prototypes/proto-info.install | 2 -- prototypes/rc-script.proto | 2 -- 15 files changed, 30 deletions(-) diff --git a/prototypes/PKGBUILD-bzr.proto b/prototypes/PKGBUILD-bzr.proto index 81f145f..32f1064 100644 --- a/prototypes/PKGBUILD-bzr.proto +++ b/prototypes/PKGBUILD-bzr.proto @@ -60,5 +60,3 @@ package() { cd "$srcdir/$_bzrmod-build" make DESTDIR="$pkgdir/" install } - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-cvs.proto b/prototypes/PKGBUILD-cvs.proto index 982c149..426331f 100644 --- a/prototypes/PKGBUILD-cvs.proto +++ b/prototypes/PKGBUILD-cvs.proto @@ -61,5 +61,3 @@ package() { cd "$srcdir/$_cvsmod-build" make DESTDIR="$pkgdir/" install } - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-darcs.proto b/prototypes/PKGBUILD-darcs.proto index 979e9b5..4fb852a 100644 --- a/prototypes/PKGBUILD-darcs.proto +++ b/prototypes/PKGBUILD-darcs.proto @@ -62,5 +62,3 @@ package() { cd "$srcdir/$_darcsmod-build" make DESTDIR="$pkgdir/" install } - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-git.proto b/prototypes/PKGBUILD-git.proto index 05b721b..4f14e64 100644 --- a/prototypes/PKGBUILD-git.proto +++ b/prototypes/PKGBUILD-git.proto @@ -60,5 +60,3 @@ package() { cd "$srcdir/$_gitname-build" make DESTDIR="$pkgdir/" install } - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-gnome.proto b/prototypes/PKGBUILD-gnome.proto index bfffdab..ac71b79 100644 --- a/prototypes/PKGBUILD-gnome.proto +++ b/prototypes/PKGBUILD-gnome.proto @@ -43,5 +43,3 @@ package() { "$pkgdir"/etc/gconf/schemas/*.schemas rm -f "$pkgdir"/etc/gconf/schemas/*.schemas } - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-haskell.proto b/prototypes/PKGBUILD-haskell.proto index c63001e..07f4a40 100644 --- a/prototypes/PKGBUILD-haskell.proto +++ b/prototypes/PKGBUILD-haskell.proto @@ -48,5 +48,3 @@ package() { ln -s "/usr/share/doc/$pkgname/html" "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname" runhaskell Setup copy --destdir="$pkgdir" } - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-hg.proto b/prototypes/PKGBUILD-hg.proto index 8474533..e486d6d 100644 --- a/prototypes/PKGBUILD-hg.proto +++ b/prototypes/PKGBUILD-hg.proto @@ -61,5 +61,3 @@ package() { cd "$srcdir/$_hgrepo-build" make DESTDIR="$pkgdir/" install } - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-perl.proto b/prototypes/PKGBUILD-perl.proto index 26b9c53..38c3b7a 100644 --- a/prototypes/PKGBUILD-perl.proto +++ b/prototypes/PKGBUILD-perl.proto @@ -51,5 +51,3 @@ package() { ## For packages with Build.PL, do this instead: # perl Build install } - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-python.proto b/prototypes/PKGBUILD-python.proto index 19b8f11..41711a9 100644 --- a/prototypes/PKGBUILD-python.proto +++ b/prototypes/PKGBUILD-python.proto @@ -30,5 +30,3 @@ package() { cd "$srcdir/$pkgname-$pkgver" python setup.py install --root="$pkgdir/" --optimize=1 } - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-rubygem.proto b/prototypes/PKGBUILD-rubygem.proto index 84fbd70..1aebe57 100644 --- a/prototypes/PKGBUILD-rubygem.proto +++ b/prototypes/PKGBUILD-rubygem.proto @@ -30,5 +30,3 @@ package() { gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \ "$_gemname-$pkgver.gem" } - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-svn.proto b/prototypes/PKGBUILD-svn.proto index aff5ca9..48c98bb 100644 --- a/prototypes/PKGBUILD-svn.proto +++ b/prototypes/PKGBUILD-svn.proto @@ -59,5 +59,3 @@ package() { cd "$srcdir/$_svnmod-build" make DESTDIR="$pkgdir/" install } - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/proto-gnome.install b/prototypes/proto-gnome.install index 175a146..9d3c7e9 100644 --- a/prototypes/proto-gnome.install +++ b/prototypes/proto-gnome.install @@ -20,5 +20,3 @@ pre_remove() { post_remove() { update-desktop-database -q } - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/proto-haskell.install b/prototypes/proto-haskell.install index bcc8676..962d0e1 100644 --- a/prototypes/proto-haskell.install +++ b/prototypes/proto-haskell.install @@ -16,5 +16,3 @@ post_upgrade() { pre_remove() { "$HS_DIR/unregister.sh" } - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/proto-info.install b/prototypes/proto-info.install index 617652f..73131bc 100644 --- a/prototypes/proto-info.install +++ b/prototypes/proto-info.install @@ -18,5 +18,3 @@ pre_remove() { install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null done } - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/rc-script.proto b/prototypes/rc-script.proto index 6c9225a..dc34e64 100644 --- a/prototypes/rc-script.proto +++ b/prototypes/rc-script.proto @@ -67,5 +67,3 @@ case "$1" in esac exit 0 - -# vim:set ts=2 sw=2 et: -- 1.8.0

2 3

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20121115-1-g890baf6
by pierre＠archlinux.org 15 Nov '12

15 Nov '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 "The official devtools repository". The branch, master has been updated via 890baf68915294d27dfb11efc7a889e21e46ec2b (commit) from 2020fb406a37d4d1ee981e72f9fa08d203e39cad (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 890baf68915294d27dfb11efc7a889e21e46ec2b Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Thu Nov 15 09:22:50 2012 -0500 Make sure the usage functions are consistent The usage messages now begins with a "Usage:", i.e. capitalized and with a colon. Fixes FS#26956. Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> ----------------------------------------------------------------------- Summary of changes: archbuild.in | 2 +- commitpkg.in | 4 ++-- finddeps.in | 2 +- makechrootpkg.in | 2 +- mkarchroot.in | 2 +- rebuildpkgs.in | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools][PATCH 2/2] Make sure the usage functions are consistent
by Eric Bélanger 15 Nov '12

15 Nov '12

The usage messages now begins with a "Usage:", i.e. capitalized and with a colon. Fixes FS#26956. Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- archbuild.in | 2 +- commitpkg.in | 4 ++-- finddeps.in | 2 +- makechrootpkg.in | 2 +- mkarchroot.in | 2 +- rebuildpkgs.in | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/archbuild.in b/archbuild.in index 00234f3..10d33b8 100644 --- a/archbuild.in +++ b/archbuild.in @@ -18,7 +18,7 @@ chroots='/var/lib/archbuild' clean_first=false usage() { - echo "usage $cmd" + echo "Usage: $cmd" echo ' -c Recreate the chroot before building' echo ' -r <dir> Create chroots in this directory' exit 1 diff --git a/commitpkg.in b/commitpkg.in index e31838c..d9ee0aa 100644 --- a/commitpkg.in +++ b/commitpkg.in @@ -42,7 +42,7 @@ pkgbase=${pkgbase:-$pkgname} case "$cmd" in commitpkg) if (( $# == 0 )); then - die 'usage: commitpkg <reponame> [-f] [-s server] [-l limit] [-a arch] [commit message]' + die 'Usage: commitpkg <reponame> [-f] [-s server] [-l limit] [-a arch] [commit message]' fi repo="$1" shift @@ -51,7 +51,7 @@ case "$cmd" in repo="${cmd%pkg}" ;; *) - die 'usage: commitpkg <reponame> [-f] [-s server] [-l limit] [-a arch] [commit message]' + die 'Usage: commitpkg <reponame> [-f] [-s server] [-l limit] [-a arch] [commit message]' ;; esac diff --git a/finddeps.in b/finddeps.in index 1526fb8..7a2a3fb 100644 --- a/finddeps.in +++ b/finddeps.in @@ -8,7 +8,7 @@ m4_include(lib/common.sh) match=$1 if [[ -z $match ]]; then - echo 'usage: finddeps <depname>' + echo 'Usage: finddeps <depname>' echo '' echo 'Find packages that depend on a given depname.' echo 'Run this script from the top-level directory of your ABS tree.' diff --git a/makechrootpkg.in b/makechrootpkg.in index 6c0b013..762ad7b 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -28,7 +28,7 @@ default_copy=$USER src_owner=${SUDO_USER:-$USER} usage() { - echo "usage ${0##*/} [options] -r <chrootdir> [--] [makepkg args]" + echo "Usage: ${0##*/} [options] -r <chrootdir> [--] [makepkg args]" echo ' Run this script in a PKGBUILD dir to build a package inside a' echo ' clean chroot. All unrecognized arguments passed to this script' echo ' will be passed to makepkg.' diff --git a/mkarchroot.in b/mkarchroot.in index 76ad840..094bac4 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -22,7 +22,7 @@ APPNAME=$(basename "${0}") # usage: usage <exitvalue> usage() { - echo "usage ${APPNAME} [options] working-dir [package-list | app]" + echo "Usage: ${APPNAME} [options] working-dir [package-list | app]" echo ' options:' echo ' -r <app> Run "app" within the context of the chroot' echo ' -u Update the chroot via pacman' diff --git a/rebuildpkgs.in b/rebuildpkgs.in index f7b1612..a4c8969 100644 --- a/rebuildpkgs.in +++ b/rebuildpkgs.in @@ -12,7 +12,7 @@ m4_include(lib/common.sh) if (( $# < 1 )); then - echo "usage: $(basename $0) <chrootdir> <packages to rebuild>" + echo "Usage: $(basename $0) <chrootdir> <packages to rebuild>" echo " example: $(basename $0) ~/chroot readline bash foo bar baz" exit 1 fi -- 1.8.0

2 2