Updating removal of adjtime in a split out hook for wheezy.

This commit is contained in:
Daniel Baumann 2012-12-13 20:32:05 +01:00
parent 4e65bcbb5b
commit 414b89ed3f
3 changed files with 24 additions and 5 deletions

View File

@ -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

View File

@ -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~

View File

@ -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