From d0bc04c56ce310be93f95b79e6a5e0e602cbb6db Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Mon, 18 Jan 2016 00:35:17 -0800 Subject: [PATCH] fix fcopy recursive perms --- fai/config/class/50-host-classes | 2 +- fai/config/files/etc/apt/sources.list/STABLE | 8 ++++++++ fai/config/scripts/GRUB_PC/11-ian | 4 +++- 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 fai/config/files/etc/apt/sources.list/STABLE diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes index 5b38bb6..f0bbd9d 100755 --- 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 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 18c51ff..16e86de 100755 --- 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 -- 2.30.2