fix fcopy recursive perms

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index 5b38bb60efbd95aaa3413ee971253795e064f4d0..f0bbd9d3cda8485332f1a059e3ab1fc44694f9c5 100755 (executable)
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -8,7 +8,7 @@
 # use a list of classes for our demo machine
 case $HOSTNAME in
     demohost)
-        echo "FAIBASE DEBIAN DESKTOP" ;;
+        echo "FAIBASE DEBIAN DESKTOP STABLE" ;;
     x2)
         echo "FAIBASE DEBIAN DESKTOP ONE_DISK" ;;
     tp)

diff --git a/fai/config/files/etc/apt/sources.list/STABLE b/fai/config/files/etc/apt/sources.list/STABLE
new file mode 100644 (file)
index 0000000..5098b82
--- /dev/null
+++ b/fai/config/files/etc/apt/sources.list/STABLE
@@ -0,0 +1,8 @@
+deb http://httpredir.debian.org/debian stable main
+deb-src http://httpredir.us.debian.org/debian stable main
+
+deb http://security.debian.org/ wheezy/updates main
+deb-src http://security.debian.org/ wheezy/updates main
+
+deb http://httpredir.org/debian/ wheezy-updates main
+deb-src http://httpredir.debian.org/debian/ wheezy-updates main

diff --git a/fai/config/scripts/GRUB_PC/11-ian b/fai/config/scripts/GRUB_PC/11-ian
index 18c51ff9b673f9fd657aa58cf2397e46bc0be647..16e86de01610b6f43d77c458c115210d84dcd996 100755 (executable)
--- a/fai/config/scripts/GRUB_PC/11-ian
+++ b/fai/config/scripts/GRUB_PC/11-ian
@@ -8,7 +8,9 @@ $ROOTCMD usermod -p "$ROOTPW" ian
 
 /var/lib/fai/config/distro-install-common/end
 
-fcopy -r -m 1000,1000,700 -i /home/ian/.ssh
+fcopy -rM -i /home/ian/.ssh
+chown -R 1000:1000 $target/home/ian/.ssh
+chmod -R u=Xrw,og= $target/home/ian/.ssh
 cp -ar $target/home/ian/.ssh $target/root
 chown -R root:root $target/root/.ssh