From 02b32aa7fe4022fdefc80552539ecba4f1067492 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sat, 6 Oct 2007 12:37:30 +0200 Subject: [PATCH] Set $HOSTNAME to according hostname --- debian/changelog | 3 +++ etc/grml/fai/config/scripts/GRMLBASE/05-hostname | 2 +- etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs | 2 +- etc/grml/fai/config/scripts/GRMLBASE/15-initsetup | 2 +- etc/grml/fai/config/scripts/GRMLBASE/20-sudo | 2 +- etc/grml/fai/config/scripts/GRMLBASE/21-usersetup | 2 +- etc/grml/fai/config/scripts/GRMLBASE/25-locales | 2 +- etc/grml/fai/config/scripts/GRMLBASE/30-fstab | 2 +- etc/grml/fai/config/scripts/GRMLBASE/31-motd | 2 +- etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup | 2 +- etc/grml/fai/config/scripts/GRMLBASE/34-hosts | 7 +++++-- etc/grml/fai/config/scripts/GRMLBASE/35-network | 2 +- etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives | 2 +- etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot | 2 +- etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build | 2 +- 15 files changed, 21 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 60cf2b5..384ab1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,9 @@ grml-live (0.0.4) unstable; urgency=low - tgt: Linux target framework user-space tools - paperkey: extract just the secret information out ouf OpenPGP keys - gitpkg: helper scripts for maintaining packages with git + * Set $HOSTNAME to according hostname via + /etc/grml/fai/config/scripts/GRMLBASE/34-hosts + * Adjust filename in header of /etc/grml/fai/config/scripts/GRMLBASE/*. -- Michael Prokop Thu, 04 Oct 2007 22:16:34 +0200 diff --git a/etc/grml/fai/config/scripts/GRMLBASE/05-hostname b/etc/grml/fai/config/scripts/GRMLBASE/05-hostname index f38d2fd..2385be3 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/05-hostname +++ b/etc/grml/fai/config/scripts/GRMLBASE/05-hostname @@ -1,5 +1,5 @@ #!/bin/sh -# Filename: /etc/grml/fai/config/scripts/GRML/05-hostname +# Filename: /etc/grml/fai/config/scripts/GRMLBASE/05-hostname # Purpose: set hostname of live-system # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ diff --git a/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs b/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs index 2894ff4..421639c 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs +++ b/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs @@ -1,5 +1,5 @@ #!/bin/sh -# Filename: /etc/grml/fai/config/scripts/GRML/10-build-initramfs +# Filename: /etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs # Purpose: configure live-initramfs and build initramfs for booting # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ diff --git a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup index 2d18f64..dadd5ae 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup +++ b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup @@ -1,5 +1,5 @@ #!/bin/sh -# Filename: /etc/grml/fai/config/scripts/GRML/15-initsetup +# Filename: /etc/grml/fai/config/scripts/GRMLBASE/15-initsetup # Purpose: configure init system for the live-system # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ diff --git a/etc/grml/fai/config/scripts/GRMLBASE/20-sudo b/etc/grml/fai/config/scripts/GRMLBASE/20-sudo index 54f85b6..c550c5f 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/20-sudo +++ b/etc/grml/fai/config/scripts/GRMLBASE/20-sudo @@ -1,5 +1,5 @@ #!/bin/sh -# Filename: /etc/grml/fai/config/scripts/GRML/20-sudo +# Filename: /etc/grml/fai/config/scripts/GRMLBASE/20-sudo # Purpose: configure sudo setup of the live-system # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ diff --git a/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup b/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup index ce42a3c..55c09cc 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup +++ b/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup @@ -1,5 +1,5 @@ #!/bin/sh -# Filename: /etc/grml/fai/config/scripts/GRML/21-usersetup +# Filename: /etc/grml/fai/config/scripts/GRMLBASE/21-usersetup # Purpose: adjust user setup of the live-system # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ diff --git a/etc/grml/fai/config/scripts/GRMLBASE/25-locales b/etc/grml/fai/config/scripts/GRMLBASE/25-locales index c093e28..c774164 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/25-locales +++ b/etc/grml/fai/config/scripts/GRMLBASE/25-locales @@ -1,5 +1,5 @@ #!/bin/sh -# Filename: /etc/grml/fai/config/scripts/GRML/25-locales +# Filename: /etc/grml/fai/config/scripts/GRMLBASE/25-locales # Purpose: locales (language) configuration of the live system # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ diff --git a/etc/grml/fai/config/scripts/GRMLBASE/30-fstab b/etc/grml/fai/config/scripts/GRMLBASE/30-fstab index 08cd375..eb3f192 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/30-fstab +++ b/etc/grml/fai/config/scripts/GRMLBASE/30-fstab @@ -1,5 +1,5 @@ #!/bin/sh -# Filename: /etc/grml/fai/config/scripts/GRML/30-fstab +# Filename: /etc/grml/fai/config/scripts/GRMLBASE/30-fstab # Purpose: create initial /etc/fstab for use on live-system # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ diff --git a/etc/grml/fai/config/scripts/GRMLBASE/31-motd b/etc/grml/fai/config/scripts/GRMLBASE/31-motd index 05d7b01..679c95f 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/31-motd +++ b/etc/grml/fai/config/scripts/GRMLBASE/31-motd @@ -1,5 +1,5 @@ #!/bin/sh -# Filename: /etc/grml/fai/config/scripts/GRML/31-motd +# Filename: /etc/grml/fai/config/scripts/GRMLBASE/31-motd # Purpose: make sure the motd setup is correct # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ diff --git a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup index 740b81e..0edf2f2 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup +++ b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup @@ -1,5 +1,5 @@ #!/bin/sh -# Filename: /etc/grml/fai/config/scripts/GRML/33-aptsetup +# Filename: /etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup # Purpose: configure Debian package management of live-system # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ diff --git a/etc/grml/fai/config/scripts/GRMLBASE/34-hosts b/etc/grml/fai/config/scripts/GRMLBASE/34-hosts index 4e9c513..1363b95 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/34-hosts +++ b/etc/grml/fai/config/scripts/GRMLBASE/34-hosts @@ -1,10 +1,10 @@ #!/bin/sh -# Filename: /etc/grml/fai/config/scripts/GRML/34-hosts +# Filename: /etc/grml/fai/config/scripts/GRMLBASE/34-hosts # Purpose: configure /etc/hosts of live-system # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2 or any later version. -# Latest change: Sun Sep 16 23:10:46 CEST 2007 [mika] +# Latest change: Sat Oct 06 12:35:30 CEST 2007 [mika] ################################################################################ set -u @@ -18,5 +18,8 @@ if [ -r /etc/grml/fai/files/etc/hosts ] ; then cp /etc/grml/fai/files/etc/hosts $target/etc/hosts fi +# replace $HOSTNAME with the real hostname: +sed -i "s/\$HOSTNAME/$HOSTNAME/" $target/etc/hosts + ## END OF FILE ################################################################# # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3 diff --git a/etc/grml/fai/config/scripts/GRMLBASE/35-network b/etc/grml/fai/config/scripts/GRMLBASE/35-network index a16460f..93a1289 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/35-network +++ b/etc/grml/fai/config/scripts/GRMLBASE/35-network @@ -1,5 +1,5 @@ #!/bin/sh -# Filename: /etc/grml/fai/config/scripts/GRML/35-network +# Filename: /etc/grml/fai/config/scripts/GRMLBASE/35-network # Purpose: set up /etc/network/interfaces of live-system # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ diff --git a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives index 7825cab..d76170b 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives +++ b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives @@ -1,5 +1,5 @@ #!/bin/sh -# Filename: /etc/grml/fai/config/scripts/GRML/90-update-alternatives +# Filename: /etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives # Purpose: set up /etc/alternatives/* according to grml preferences # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ diff --git a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot index 9af8da1..5e00eee 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot +++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot @@ -1,5 +1,5 @@ #!/bin/sh -# Filename: /etc/grml/fai/config/scripts/GRML/98-clean-chroot +# Filename: /etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot # Purpose: clean up chroot system # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ diff --git a/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build b/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build index b421ce3..8d8c626 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build +++ b/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build @@ -1,5 +1,5 @@ #!/bin/sh -# Filename: /etc/grml/fai/config/scripts/GRML/99-finish-grml-build +# Filename: /etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build # Purpose: finalize grml chroot build # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ -- 2.1.4