- Arch-projects - lists.archlinux.org

[arch-projects] [dbscripts] [PATCH] Add signature files to update/move/remove targets
by Rémy Oudompheng 31 Mar '11

31 Mar '11

Signature files are optional and the previous behaviour is unchanged when signatures files do not exist. Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> --- This patch was already posted with very slight differences on the mailing-list by Allan. It needed several changes to fit the current state of dbscripts. I hope this one will allow to move forward. Still nothing in the test suite: we would need to run gpg after the extra-*-build invocation and extra checks for the presence/absence of signature files in the repos. cron-jobs/ftpdir-cleanup | 10 ++++++++-- db-move | 3 +++ db-update | 7 +++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup index 09e8a49..bb1661a 100755 --- a/cron-jobs/ftpdir-cleanup +++ b/cron-jobs/ftpdir-cleanup @@ -10,9 +10,12 @@ clean_pkg() { if ! ${CLEANUP_DRYRUN}; then for pkg in "$@"; do if [ -h "$pkg" ]; then - rm -f "$pkg" + rm -f "$pkg" "$pkg.sig" else mv -f "$pkg" "$CLEANUP_DESTDIR" + if [ -e "$pkg.sig" ]; then + mv -f "$pkg.sig" "$CLEANUP_DESTDIR" + fi touch "${CLEANUP_DESTDIR}/$(basename ${pkg})" fi done @@ -100,7 +103,10 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then msg "Removing old packages from the cleanup directory..." for old_pkg in ${old_pkgs[@]}; do msg2 "${old_pkg}" - ${CLEANUP_DRYRUN} || rm -f "${CLEANUP_DESTDIR}/${old_pkg}" + if ! ${CLEANUP_DRYRUN}; then + rm -f "${CLEANUP_DESTDIR}/${old_pkg}" + rm -f "${CLEANUP_DESTDIR}/${old_pkg}.sig" + fi done fi diff --git a/db-move b/db-move index ced90a3..ff1b0e2 100755 --- a/db-move +++ b/db-move @@ -96,6 +96,9 @@ for pkgbase in ${args[@]:2}; do cp ${pkgpath} ${FTP_BASE}/${PKGPOOL} fi ln -s "../../../${PKGPOOL}/${pkgfile}" ${ftppath_to}/${tarch}/ + if [ -f ${FTP_BASE}/${PKGPOOL}/${pkgfile}.sig ]; then + ln -s "../../../${PKGPOOL}/${pkgfile}.sig" ${ftppath_to}/${tarch}/ + fi add_pkgs[${tarch}]+="${FTP_BASE}/${PKGPOOL}/${pkgfile} " remove_pkgs[${tarch}]+="${pkgname} " done diff --git a/db-update b/db-update index 5bdce5e..4b9c78f 100755 --- a/db-update +++ b/db-update @@ -64,6 +64,13 @@ for repo in ${repos[@]}; do mv "${pkg}" "$FTP_BASE/${PKGPOOL}" fi ln -s "../../../${PKGPOOL}/${pkgfile}" "$FTP_BASE/$repo/os/${pkgarch}" + # also move signatures + if [ -f "${pkg}.sig" ]; then + mv "${pkg}.sig" "$FTP_BASE/${PKGPOOL}" + fi + if [ -f "$FTP_BASE/${PKGPOOL}/${pkgfile}.sig" ]; then + ln -s "../../../${PKGPOOL}/${pkgfile}.sig" "$FTP_BASE/$repo/os/${pkgarch}" + fi add_pkgs[${#add_pkgs[*]}]=${pkgfile} done if [ ${#add_pkgs[@]} -ge 1 ]; then -- 1.7.4.2

1 0

Re: [arch-projects] [arch-dev-public] [initscripts] Linux distributions and /run/
by Tom Gundersen 31 Mar '11

31 Mar '11

On Thu, Mar 31, 2011 at 1:56 PM, Andrea Scarpino <andrea(a)archlinux.org> wrote: > About FS#18157, many of them have been fixed (mysql, mpd, httpd...), but we > need a complete list. I guess the list can be generated by grepping all the PKGBUILDs for writes to /var/run and /var/lock. Maybe it would be worth adding a warning to makepkg if files are written to /var/run, /var/lock, /tmp or /run? Cheers, Tom

4 3

Re: [arch-projects] [arch-dev-public] [initscripts] Linux distributions and /run/
by Andrea Scarpino 31 Mar '11

31 Mar '11

Am Donnerstag 31 März 2011 schrieb Thomas Bächler: > This was discussed in a bug report iirc, here is some summary: > http://www.h-online.com/open/news/item/Linux-distributions-to-include-ru > n-d irectory-1219006.html > > Apparently, many tools (among them udev) will soon require a /run/ > directory that is mounted early (as tmpfs). It is probably a good idea > to add this to the filesystem and initscripts packages. +1 Go for it. About FS#18157, many of them have been fixed (mysql, mpd, httpd...), but we need a complete list. -- Andrea

1 0

[arch-projects] [initscripts] [PATCH 1/2] Make hwclock --adjust as well as --systohc optional (FS#13684)
by Kurt J. Bosch 30 Mar '11

30 Mar '11

From db75b4636156aea2a65b600c0d4e65e08de41138 Mon Sep 17 00:00:00 2001 From: Kurt J. Bosch <kjb-temp-2009(a)alpenjodel.de> Date: Mon, 28 Mar 2011 19:06:05 +0200 Subject: [PATCH 1/2] Make hwclock --adjust as well as --systohc optional (FS#13684) --- adjtime.cron | 2 +- hwclock | 39 +++++++++++++++++++++++++++++++++++++++ install.sh | 2 +- rc.conf | 5 ++++- rc.shutdown | 13 ++----------- rc.sysinit | 27 +++------------------------ 6 files changed, 50 insertions(+), 38 deletions(-) create mode 100755 hwclock diff --git a/adjtime.cron b/adjtime.cron index a876506..dac8cea 100755 --- a/adjtime.cron +++ b/adjtime.cron @@ -10,6 +10,6 @@ case $HARDWARECLOCK in *) HWCLOCK_PARAMS="";; esac -if [[ $HWCLOCK_PARAMS ]]; then +if [[ $HWCLOCK_PARAMS && -f /var/run/daemons/hwclock ]]; then /sbin/hwclock $HWCLOCK_PARAMS fi diff --git a/hwclock b/hwclock new file mode 100755 index 0000000..d9de9e1 --- /dev/null +++ b/hwclock @@ -0,0 +1,39 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case $HARDWARECLOCK in + UTC) HWCLOCK_PARAMS="--utc";; + localtime) HWCLOCK_PARAMS="--localtime";; + *) HWCLOCK_PARAMS="";; +esac + +case "$1" in + start) + if [[ $HWCLOCK_PARAMS ]]; then + status "Adjusting Hardware Clock" \ + /sbin/hwclock --adjust + stat_busy "Setting System Clock" + /sbin/hwclock --hctosys $HWCLOCK_PARAMS || stat_die + stat_done + # Note: This also enables /etc/cron.hourly/adjtime + add_daemon hwclock + fi + ;; + stop) + if [[ $HWCLOCK_PARAMS ]]; then + stat_busy "Saving System Clock" + /sbin/hwclock --systohc $HWCLOCK_PARAMS || stat_die + stat_done + fi + rm_daemon hwclock + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/install.sh b/install.sh index 2b2cbbc..8e6c3d7 100755 --- a/install.sh +++ b/install.sh @@ -15,7 +15,7 @@ done install -D -m755 adjtime.cron ${DESTDIR}/etc/cron.hourly/adjtime install -D -m644 functions ${DESTDIR}/etc/rc.d/functions || exit 1 -for i in network netfs; do +for i in hwclock network netfs; do install -D -m755 $i ${DESTDIR}/etc/rc.d/$i || exit 1 done diff --git a/rc.conf b/rc.conf index d2b0517..0b0a818 100644 --- a/rc.conf +++ b/rc.conf @@ -105,4 +105,7 @@ NETWORK_PERSIST="no" # - prefix a daemon with a ! to disable it # - prefix a daemon with a @ to start it up in the background # -DAEMONS=(syslog-ng network netfs crond) +# If something other takes care of your hardware clock (ntpd, dual-boot...) +# you should disable 'hwclock' here. +# +DAEMONS=(hwclock syslog-ng network netfs crond) diff --git a/rc.shutdown b/rc.shutdown index 0acca49..fef1117 100755 --- a/rc.shutdown +++ b/rc.shutdown @@ -35,21 +35,12 @@ fi /bin/dd if=/dev/urandom of=$RANDOM_SEED count=1 bs=$POOL_SIZE &> /dev/null stat_done -stat_busy "Saving System Clock" if [[ $TIMEZONE && -e /usr/share/zoneinfo/$TIMEZONE ]]; then /bin/rm -f /etc/localtime - /bin/cp "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime + status "Saving Time Zone" \ + /bin/cp "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime fi -HWCLOCK_PARAMS="--systohc" -case $HARDWARECLOCK in - UTC) HWCLOCK_PARAMS="$HWCLOCK_PARAMS --utc";; - localtime) HWCLOCK_PARAMS="$HWCLOCK_PARAMS --localtime";; - *) HWCLOCK_PARAMS="";; -esac -[[ $HWCLOCK_PARAMS ]] && /sbin/hwclock $HWCLOCK_PARAMS -stat_done - # removing psmouse module to fix some reboot issues on newer laptops /sbin/modprobe -r psmouse >/dev/null 2>&1 diff --git a/rc.sysinit b/rc.sysinit index 9797611..e949180 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -66,7 +66,7 @@ if [[ $HWCLOCK_PARAMS ]]; then # configured timezone. Any new timezone put in rc.conf is copied over at # a later time. # This does *NOT* take into account a time adjustment file as /var may not be - # mounted yet. A second set occurs later to match rc.conf. + # mounted yet. A second set may occur in rc.d/hwclock to match rc.conf. if [[ -f /etc/localtime ]]; then /sbin/hwclock $HWCLOCK_PARAMS --noadjfile fi @@ -304,28 +304,12 @@ status "Retrying failed UDev events" /sbin/udevadm trigger --action=add --type=f status "Activating Swap" /sbin/swapon -a -stat_busy "Configuring System Clock" if [[ $TIMEZONE && -e /usr/share/zoneinfo/$TIMEZONE ]]; then /bin/rm -f /etc/localtime - /bin/cp "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime + status "Configuring Time Zone" \ + /bin/cp "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime fi -clock_pid="" -if [[ $HWCLOCK_PARAMS ]]; then - # This time, we set the clock for real. Use the adjustment file now that - # /var will definitely be available, and then set the system clock once - # the hardware clock has been adjusted accordingly. The backgrounding magic - # is due to the fact that the second call to hwclock will almost always - # take ~1 second because of the clock granularity, and we might as well - # stay busy. - ( - /sbin/hwclock --adjust - /sbin/hwclock $HWCLOCK_PARAMS - ) & - clock_pid=$! -fi -stat_done - RANDOM_SEED=/var/lib/misc/random-seed if [[ -f $RANDOM_SEED ]]; then stat_busy "Initializing Random Seed" @@ -398,11 +382,6 @@ set_consolefont /bin/dmesg >| /var/log/dmesg.log -# final hwclock setting needs to be done at this point -if [[ $clock_pid ]]; then - wait $clock_pid -fi - run_hook sysinit_end # End of file -- 1.7.0.3

2 4

[arch-projects] [INITSCRIPTS] Improvment & bug fix
by Seblu 30 Mar '11

30 Mar '11

Hello, You can see 2 patches. First add a new rc helper which allow to do thing list this # rc start sshd dbus gpm # rc stop syslog-ng # rc list This is a similar behaviour to debian invoke-rc.d. Second fix bug: https://bugs.archlinux.org/task/23373 Regards, -- Sébastien Luttringer www.seblu.net

4 6

[arch-projects] [PATCH 0/7] Bash cleanup and migration away from net-tools
by Dave Reisner 30 Mar '11

30 Mar '11

Hi all, Hoping to get some movement on this list started early, so I'm peeling off some patches from my git tree that I've had sitting around for a while. The first 6 are rudimentary cleanup -- they don't try to affect functionality, but rather are meant to clean inconsistant or questionable syntax used, as well as possibly shave off a few CPU cycles here and there. The final patch is a little more controversial and proposes to remove the decade old net-tools from the network service. This is a fairly straightforward change that was patched in a similar manner several years ago by James Raynor (iphitus), in response to FS #10160 which was eventually closed as "deferred". For the uninitiated, net-tools still uses the old deprecated ioctl kernel interface for getting/setting network data. While I'm not convinced that this interface will ever go away, it seems reasonable to me to switch to iproute2 which uses netlink sockets to communicate with the kernel. We can leave net-tools available, but imo we should make an effort to eventually move it from core and into extra. To that extent, there's a few of changes we'll need to make elsewhere that I'll outline: 1) net-tools currently provides /bin/hostname. coreutils can provide this as well -- we just need to enable it in ./configure. 2) Move yp-tools into core. With the above, coreutils' hostname util does not have a facility to set a nis/yp domainname. yp-tools provides this in /bin/domainname which needs to be enabled in ./configure. I'll further suggest that we create the same symlinks net-tools provides to /bin/domainname to ease the transition. 3) In conjunction with the above changes, we'll of course need to change net-tools to not provide /bin/{host,{nis,yp,}domain}name. This last patch really is more of an RFC, and I'm just looking to get the ball rolling. I realize this would be a significant change and should not be taken lightly. Regards, dave

3 21

Re: [arch-projects] [INITSCRIPTS] Improvment & bug fix
by Tom Gundersen 30 Mar '11

30 Mar '11

On Tue, Mar 29, 2011 at 1:02 PM, Victor Lowther <victor.lowther(a)gmail.com> wrote: > > On Mar 29, 2011 4:42 AM, "Tom Gundersen" <teg(a)jklm.no> wrote: >> >> Victor, >> >> On Tue, Mar 29, 2011 at 3:15 AM, Seblu <seblu(a)seblu.net> wrote: >> > You can see 2 patches. >> [...] >> > Second fix bug: https://bugs.archlinux.org/task/23373 >> >> As you wrote the patched referenced int the FS, could I get your ACK >> on Seb's second patch (or an explanation if the change was >> intentional): > > The change was intentional, but I did not know the original unquoted > expansion was on purpose. > Seb's patch is fine. Thanks! -t

3 4

[arch-projects] New list: arch-projects
by Thomas Bächler 28 Mar '11

28 Mar '11

A new list has been created: arch-projects. This list is for development discussion, patches and pull requests for initscripts, netcfg, dbscripts, devtools (and maybe other projects, those are the ones I could think of). Anyone is free to subscribe, but please, no user discussions (keep those to the forums or arch-general). Fun fact: There was a mailing list called arch-projects once, and it has been deleted, but the old archives are still there.

4 7

Re: [arch-projects] [PATCH] Make hwclock --adjust as well as --systohc optional (FS#13684)
by Tom Gundersen 28 Mar '11

28 Mar '11

On Monday 28 March 2011 11:49:16 Dave Reisner wrote: > On Mon, Mar 28, 2011 at 05:23:20PM +0200, Tom Gundersen wrote: > > Please let me know if anyone disagrees with my analysis, or if I have > > overlooked something important. > > I think this is a fair analysis. Thanks for taking the time to explain > your reasoning. My only (personal) concern about my clock is that its > accurate enough so that cron runs when I expect it to. A few minutes > here and there hopefully isn't going to set off my OCD ;) Thanks to Kurt for explaining to me the weird and unfortunate workings of hwclock! Kurt, could you squash your two commits, and create a new one with the "UTC as default" setting (or drop the UTC stuff alltogether if you prefer, and I'll make a patch when I have time). If there are no more objections within a few days I'll apply this. Cheers, Tom

1 0

[arch-projects] [PATCH] Make hwclock --adjust as well as --systohc optional (FS#13684)
by Kurt J. Bosch 28 Mar '11

28 Mar '11

This turns all hardware clock write access (setting and adjusting) the into an optional daemon. (FS#13684) Should fix issues when using ntpd (kernel 11-minute-mode) and also in case of dual-boot. Further more the out of box HARDWARECLOCK setting is changed to "UTC" and "localtime" is discouraged because it can really mess up things especially with 'hwclock --adjust'. For previous discussion see https://bugs.archlinux.org/task/13684 From 39d86d1d831210aca9f592eed5555389b2216d7c Mon Sep 17 00:00:00 2001 From: Kurt J. Bosch <kjb-temp-2009(a)alpenjodel.de> Date: Mon, 28 Mar 2011 15:01:43 +0200 Subject: [PATCH] Make hwclock --adjust as well as --systohc optional (FS#13684) --- adjtime.cron | 2 +- hwclock | 39 +++++++++++++++++++++++++++++++++++++++ install.sh | 2 +- rc.conf | 8 ++++++-- rc.shutdown | 13 ++----------- rc.sysinit | 27 +++------------------------ 6 files changed, 52 insertions(+), 39 deletions(-) create mode 100644 hwclock diff --git a/adjtime.cron b/adjtime.cron index a876506..7691aa5 100755 --- a/adjtime.cron +++ b/adjtime.cron @@ -10,6 +10,6 @@ case $HARDWARECLOCK in *) HWCLOCK_PARAMS="";; esac -if [[ $HWCLOCK_PARAMS ]]; then +if [[ $HWCLOCK_PARAMS && -f /var/daemons/hwclock ]]; then /sbin/hwclock $HWCLOCK_PARAMS fi diff --git a/hwclock b/hwclock new file mode 100644 index 0000000..d584276 --- /dev/null +++ b/hwclock @@ -0,0 +1,39 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case $HARDWARECLOCK in + UTC) HWCLOCK_PARAMS="--utc";; + localtime) HWCLOCK_PARAMS="--localtime";; + *) HWCLOCK_PARAMS="";; +esac + +case "$1" in + start) + if [[ $HWCLOCK_PARAMS ]]; then + status "Adjusting Hardware Clock" \ + /sbin/hwclock --adjust + stat_busy "Setting System Clock" + /sbin/hwclock --hctosys $HWCLOCK_PARAMS || stat_die + stat_done + # Note: This also enables /etc/cron.hourly/adjtime + add_daemon clock + fi + ;; + stop) + if [[ $HWCLOCK_PARAMS ]]; then + stat_busy "Saving System Clock" + /sbin/hwclock --systohc $HWCLOCK_PARAMS || stat_die + stat_done + fi + rm_daemon clock + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/install.sh b/install.sh index 2b2cbbc..8e6c3d7 100755 --- a/install.sh +++ b/install.sh @@ -15,7 +15,7 @@ done install -D -m755 adjtime.cron ${DESTDIR}/etc/cron.hourly/adjtime install -D -m644 functions ${DESTDIR}/etc/rc.d/functions || exit 1 -for i in network netfs; do +for i in hwclock network netfs; do install -D -m755 $i ${DESTDIR}/etc/rc.d/$i || exit 1 done diff --git a/rc.conf b/rc.conf index d2b0517..02bb1d7 100644 --- a/rc.conf +++ b/rc.conf @@ -11,6 +11,7 @@ # process. If set to 'no', the C locale will be used. # HARDWARECLOCK: set to "UTC" or "localtime", any other value will result # in the hardware clock being left untouched (useful for virtualization) +# Note: Using "localtime" is discouraged. # TIMEZONE: timezones are found in /usr/share/zoneinfo # KEYMAP: keymaps are found in /usr/share/kbd/keymaps # CONSOLEFONT: found in /usr/share/kbd/consolefonts (only needed for non-US) @@ -19,7 +20,7 @@ # LOCALE="en_US.UTF-8" DAEMON_LOCALE="no" -HARDWARECLOCK="localtime" +HARDWARECLOCK="UTC" TIMEZONE="Canada/Pacific" KEYMAP="us" CONSOLEFONT= @@ -105,4 +106,7 @@ NETWORK_PERSIST="no" # - prefix a daemon with a ! to disable it # - prefix a daemon with a @ to start it up in the background # -DAEMONS=(syslog-ng network netfs crond) +# If something other takes care of your hardware clock (ntpd, dual-boot...) +# you should disable 'hwclock' here. +# +DAEMONS=(hwclock syslog-ng network netfs crond) diff --git a/rc.shutdown b/rc.shutdown index 0acca49..fef1117 100755 --- a/rc.shutdown +++ b/rc.shutdown @@ -35,21 +35,12 @@ fi /bin/dd if=/dev/urandom of=$RANDOM_SEED count=1 bs=$POOL_SIZE &> /dev/null stat_done -stat_busy "Saving System Clock" if [[ $TIMEZONE && -e /usr/share/zoneinfo/$TIMEZONE ]]; then /bin/rm -f /etc/localtime - /bin/cp "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime + status "Saving Time Zone" \ + /bin/cp "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime fi -HWCLOCK_PARAMS="--systohc" -case $HARDWARECLOCK in - UTC) HWCLOCK_PARAMS="$HWCLOCK_PARAMS --utc";; - localtime) HWCLOCK_PARAMS="$HWCLOCK_PARAMS --localtime";; - *) HWCLOCK_PARAMS="";; -esac -[[ $HWCLOCK_PARAMS ]] && /sbin/hwclock $HWCLOCK_PARAMS -stat_done - # removing psmouse module to fix some reboot issues on newer laptops /sbin/modprobe -r psmouse >/dev/null 2>&1 diff --git a/rc.sysinit b/rc.sysinit index 9797611..e949180 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -66,7 +66,7 @@ if [[ $HWCLOCK_PARAMS ]]; then # configured timezone. Any new timezone put in rc.conf is copied over at # a later time. # This does *NOT* take into account a time adjustment file as /var may not be - # mounted yet. A second set occurs later to match rc.conf. + # mounted yet. A second set may occur in rc.d/hwclock to match rc.conf. if [[ -f /etc/localtime ]]; then /sbin/hwclock $HWCLOCK_PARAMS --noadjfile fi @@ -304,28 +304,12 @@ status "Retrying failed UDev events" /sbin/udevadm trigger --action=add --type=f status "Activating Swap" /sbin/swapon -a -stat_busy "Configuring System Clock" if [[ $TIMEZONE && -e /usr/share/zoneinfo/$TIMEZONE ]]; then /bin/rm -f /etc/localtime - /bin/cp "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime + status "Configuring Time Zone" \ + /bin/cp "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime fi -clock_pid="" -if [[ $HWCLOCK_PARAMS ]]; then - # This time, we set the clock for real. Use the adjustment file now that - # /var will definitely be available, and then set the system clock once - # the hardware clock has been adjusted accordingly. The backgrounding magic - # is due to the fact that the second call to hwclock will almost always - # take ~1 second because of the clock granularity, and we might as well - # stay busy. - ( - /sbin/hwclock --adjust - /sbin/hwclock $HWCLOCK_PARAMS - ) & - clock_pid=$! -fi -stat_done - RANDOM_SEED=/var/lib/misc/random-seed if [[ -f $RANDOM_SEED ]]; then stat_busy "Initializing Random Seed" @@ -398,11 +382,6 @@ set_consolefont /bin/dmesg >| /var/log/dmesg.log -# final hwclock setting needs to be done at this point -if [[ $clock_pid ]]; then - wait $clock_pid -fi - run_hook sysinit_end # End of file -- 1.7.0.3

3 6