diff options
| -rwxr-xr-x | functions/defaults.sh | 6 | ||||
| -rwxr-xr-x | scripts/build/chroot_hacks | 3 | ||||
| -rwxr-xr-x | share/hooks/0120-remove-adjtime-configuration.chroot | 20 |
3 files changed, 24 insertions, 5 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 8d18d449f..70fdadaf5 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -631,7 +631,8 @@ Set_defaults () remove-python-py \ remove-udev-persistent-rules \ remove-linux-image-backups \ - remove-mdadm-configuration}" + remove-mdadm-configuration \ + remote-adjtime-configuration}" ;; kubuntu) @@ -644,7 +645,8 @@ Set_defaults () remove-python-py \ remove-udev-persistent-rules \ remove-linux-image-backups \ - remove-mdadm-configuration}" + remove-mdadm-configuration \ + remove-adjtime-configuration}" ;; esac diff --git a/scripts/build/chroot_hacks b/scripts/build/chroot_hacks index f0e885b08..6fcd35e02 100755 --- a/scripts/build/chroot_hacks +++ b/scripts/build/chroot_hacks @@ -212,9 +212,6 @@ esac # people might do in local hooks, and there might be no initrds at all. find chroot/boot -name 'initrd*' -print0 | xargs -r -0 chmod go+r -# Remove build systems clock drift -echo "0.0 0 0.0" > chroot/etc/adjtime - # Remove cruft rm -f chroot/boot/initrd*bak* rm -f chroot/etc/apt/trusted.gpg~ diff --git a/share/hooks/0120-remove-adjtime-configuration.chroot b/share/hooks/0120-remove-adjtime-configuration.chroot new file mode 100755 index 000000000..5625effb8 --- /dev/null +++ b/share/hooks/0120-remove-adjtime-configuration.chroot @@ -0,0 +1,20 @@ +#!/bin/sh + +set -e + +# Reset generated file + +if [ -e /run ] +then + # wheezy + +cat > /etc/adjtime << EOF +0.0 0 0.0 +0 +UTC +EOF + +else + # squeeze + echo "0.0 0 0.0" > /etc/adjtime +fi |