diff options
| author | Daniel Baumann <daniel@debian.org> | 2013-04-09 05:54:22 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2013-04-09 05:54:22 +0200 |
| commit | 6106e81b856f0247dceac096c778350593ac991f (patch) | |
| tree | e7774f75ce861d36a9fdd44ccf81ddc6a473ec15 /scripts/build/chroot_hostname | |
| parent | 34dd4a6c704d44ed9d8994663d0855cf337f70f8 (diff) | |
| download | vyos-live-build-6106e81b856f0247dceac096c778350593ac991f.tar.gz vyos-live-build-6106e81b856f0247dceac096c778350593ac991f.zip | |
Using dpkg-divert for other diversions too to handle upgrades of the diverted stuff during build.
Diffstat (limited to 'scripts/build/chroot_hostname')
| -rwxr-xr-x | scripts/build/chroot_hostname | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/scripts/build/chroot_hostname b/scripts/build/chroot_hostname index 432d60e7f..e013afaec 100755 --- a/scripts/build/chroot_hostname +++ b/scripts/build/chroot_hostname @@ -29,8 +29,6 @@ Require_stagefile .build/config .build/bootstrap case "${1}" in install) - Echo_message "Configuring file /etc/hostname" - # Checking stage file Check_stagefile .build/chroot_hostname @@ -40,15 +38,15 @@ case "${1}" in # Creating lock file Create_lockfile .lock - # Save hostname - mv chroot/bin/hostname chroot/bin/hostname.orig - # Create hostname file + Echo_message "Configuring file /etc/hostname" + echo "localhost.localdomain" > chroot/etc/hostname + # Create custom hostname Echo_message "Configuring file /bin/hostname" - # Create hostname program + Chroot chroot dpkg-divert --rename --quiet --add /bin/hostname cat > chroot/bin/hostname << EOF #!/bin/sh @@ -79,11 +77,9 @@ EOF Echo_message "Deconfiguring file /bin/hostname" - # Restore hostname file - if [ -e chroot/bin/hostname.orig ] - then - mv chroot/bin/hostname.orig chroot/bin/hostname - fi + # Remove custom hostname + rm -f chroot/bin/hostname + Chroot chroot dpkg-divert --rename --quiet --remove /bin/hostname # Removing stage file rm -f .build/chroot_hostname |