X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FRELEASE%2F98-clean-chroot;h=626267f1dd159d81394f424d5449da8d6b467862;hb=f2ebfa66006603f4e49a1db22bee60ecdb662397;hp=d89f5de9bc49613972e511a59cd720a0d38b3a69;hpb=f3b335ea5c94d5cf24ec6b9184106b298849f311;p=grml-live.git

diff --git a/etc/grml/fai/config/scripts/RELEASE/98-clean-chroot b/etc/grml/fai/config/scripts/RELEASE/98-clean-chroot
index d89f5de..626267f 100755
--- a/etc/grml/fai/config/scripts/RELEASE/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/RELEASE/98-clean-chroot
@@ -8,6 +8,21 @@
 
 set -u
 set -e
+. "$GRML_LIVE_CONFIG"
+
+echo "Removing /var/lib/apt/lists/*-stuff, dpkg-status-old and pkgcache.bin"
+rm -f $target/var/lib/apt/lists/*Packages \
+      $target/var/lib/apt/lists/*Release \
+      $target/var/lib/apt/lists/*Sources \
+      $target/var/lib/apt/lists/*Index* \
+      $target/var/lib/apt/lists/*Translation* \
+      $target/var/lib/apt/lists/*.gpg \
+      $target/var/cache/apt-show-versions/* \
+      $target/var/cache/debconf/*.dat-old \
+      $target/var/cache/apt/*.bin
+
+echo "Removing /var/lib/aptitude/pkgstates.old"
+rm -f "${target}/var/lib/aptitude/pkgstates.old"
 
 # Remove all FAI logs from chroot via grml-live later then
 echo "Setting up /etc/grml_fai_release for grml-live"
@@ -17,9 +32,13 @@ echo "Removing all files inside /root"
 rm -rf $target/root
 mkdir -m 0755 $target/root
 
-echo "Removing all files inside /home/grml"
-rm -rf $target/home/grml
-mkdir -m 0755 $target/home/grml
+echo "Removing all files inside /home/${USERNAME}"
+rm -rf "${target}/home/${USERNAME}"
+mkdir -m 0755 "${target}/home/${USERNAME}"
+$ROOTCMD chown "${USERNAME}:${USERNAME}" "/home/${USERNAME}"
+
+echo "Syncing /home/${USERNAME}/ with data from /etc/skel/:"
+$ROOTCMD su -s /bin/sh "${USERNAME}" -c "rsync -Hav /etc/skel/ /home/${USERNAME}/"
 
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2