diff options
| author | Pino Toscano <pino@debian.org> | 2012-02-01 17:37:12 +0100 |
|---|---|---|
| committer | Pino Toscano <pino@debian.org> | 2012-02-01 17:37:12 +0100 |
| commit | d4e6a14eb3fad1b43a21214db139db441025baf5 (patch) | |
| tree | e6274eec209e42bec3793b55f73e8707fc920e38 /debian | |
| parent | 09218a5407f3d9cf04b69f8eccdad5a1e0fbda99 (diff) | |
rename {halt,reboot} to {halt,reboot}-hurd
... and handle them as slaves of the runsystem alternative.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/hurd.install | 4 | ||||
| -rw-r--r-- | debian/hurd.postinst | 4 | ||||
| -rwxr-xr-x | debian/rules | 5 |
4 files changed, 15 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 40a9fdc2..60bb729c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,11 @@ hurd (20111206-2) UNRELEASED; urgency=low * patches/ext2fs_large_stores.patch: Fix memory leak, thanks Sergio Lopez! * debian/hurd-console.default: Enable the console by default. + [ Pino Toscano ] + * hurd.install, hurd.postinst, rules: Rename halt/reboot to + halt-hurd/reboot-hurd, and register them as slaves of the runsystem + alternative. + -- Samuel Thibault <sthibault@debian.org> Sat, 21 Jan 2012 23:59:41 +0100 hurd (20111206-1) unstable; urgency=low diff --git a/debian/hurd.install b/debian/hurd.install index 35ebbf73..05254303 100644 --- a/debian/hurd.install +++ b/debian/hurd.install @@ -14,8 +14,8 @@ debian/tmp/sbin/nfsd debian/tmp/sbin/e2os debian/tmp/sbin/MAKEDEV debian/tmp/sbin/losetup -debian/tmp/sbin/reboot -debian/tmp/sbin/halt +debian/tmp/sbin/reboot-hurd +debian/tmp/sbin/halt-hurd debian/tmp/sbin/swapon debian/tmp/sbin/swapoff debian/tmp/sbin/fsck.ufs diff --git a/debian/hurd.postinst b/debian/hurd.postinst index 8f79961d..4a552ddf 100644 --- a/debian/hurd.postinst +++ b/debian/hurd.postinst @@ -8,7 +8,9 @@ if [ "$1" = configure ] && [ "$2" ]; then --remove runsystem /libexec/runsystem.gnu fi update-alternatives --quiet \ - --install /etc/hurd/runsystem runsystem /etc/hurd/runsystem.gnu 20 + --install /etc/hurd/runsystem runsystem /etc/hurd/runsystem.gnu 20 \ + --slave /sbin/halt halt /sbin/halt-hurd \ + --slave /sbin/reboot reboot /sbin/reboot-hurd update-alternatives \ --install /usr/bin/fakeroot fakeroot /usr/bin/fakeroot-hurd 30 diff --git a/debian/rules b/debian/rules index b247fed6..094f3a56 100755 --- a/debian/rules +++ b/debian/rules @@ -45,6 +45,11 @@ install/hurd:: mv debian/tmp/bin/vmstat debian/tmp/usr/bin/vmstat-hurd mv debian/tmp/bin/w debian/tmp/usr/bin/w-hurd + # move away halt and reboot to not conflict with sysvinit + # (they will be handled as alternatives) + mv debian/tmp/sbin/halt debian/tmp/sbin/halt-hurd + mv debian/tmp/sbin/reboot debian/tmp/sbin/reboot-hurd + install -m664 debian/hurd-console.default debian/hurd/etc/default/hurd-console install -m664 $(DEB_SRCDIR)/console/motd.UTF8 debian/hurd/etc/ |