use disk/by-id if possibe, other small fixes

[automated-distro-installer] / fai / config / scripts / GRUB_PC / 11-ian

diff --git a/fai/config/scripts/GRUB_PC/11-ian b/fai/config/scripts/GRUB_PC/11-ian
index 9f8cf68e622c2b1df57cc3d6938aa7f935bb7ab3..d22d8fc852df9bf871c15cecdd1627116dfbc74a 100755 (executable)
--- a/fai/config/scripts/GRUB_PC/11-ian
+++ b/fai/config/scripts/GRUB_PC/11-ian
@@ -6,15 +6,38 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
 $ROOTCMD adduser --disabled-password --gecos ian ian
 $ROOTCMD usermod -p "$ROOTPW" ian
 
+if ifclass STABLE; then
+    fcopy -M /etc/apt/preferences
+fi
 
-fcopy -rM -i /home/ian/.ssh
+if ifclass DEBIAN; then
+    fcopy -M /etc/apt/preferences.d/unstable
+    fcopy -riM /etc/apt/sources.list.d
+fi
+
+
+# -i, ignore nonmatching class error, always return 0.
+fcopy -r -M -i /home/ian/.ssh
 /var/lib/fai/config/distro-install-common/end
 
+rm -f /target/etc/apt/sources.list
+
+chroot /target bash <<'EOF'
+chown -R 1000:1000 /home/ian/.ssh
+chmod -R u=Xrw,og= /home/ian/.ssh
+cp -ar /home/ian/.ssh /root
+chown -R root:root /root/.ssh
+
+# default jessie groups + kvm & systemd-journal
+usermod -aG cdrom,floppy,sudo,audio,dip,video,plugdev,netdev,kvm,systemd-journal ian
+EOF
 
-$ROOTCMD chown -R 1000:1000 /home/ian/.ssh
-$ROOTCMD chmod -R u=Xrw,og= /home/ian/.ssh
-$ROOTCMD cp -ar /home/ian/.ssh /root
-$ROOTCMD chown -R root:root /root/.ssh
 
-# default jessie groups + kvm
-$ROOTCMD usermod -aG cdrom,floppy,sudo,audio,dip,video,plugdev,netdev,kvm ian
+$ROOTCMD apt-get -y install unison-gtk
+if ifclass STABLE; then
+    # don't think this is needed since I figured out how to
+    # deal with mismatching unison compilers, but I don't
+    # see any reason to revert it, since it only installs
+    # a single package which is primarily a single binary
+    $ROOTCMD apt-get -y install unison-gtk/testing
+fi