From: Frank Brehm <frank.brehm@profitbricks.com>
Date: Wed, 10 Sep 2014 09:43:23 +0000 (+0200)
Subject: Chowning some files to root:root and changed PB repositories to repo01.pb.local in... 
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=8d6a80be749ccf00251284067dc8a426d94bf6cb;p=profitbricks%2Fjenkins-build-scripts.git

Chowning some files to root:root and changed PB repositories to repo01.pb.local in create-grml-squash.sh
---

diff --git a/create-grml-squash.sh b/create-grml-squash.sh
index 6eb8d12..ebdb290 100755
--- a/create-grml-squash.sh
+++ b/create-grml-squash.sh
@@ -126,6 +126,14 @@ CHMOD() {
     fi
 }
 
+CHOWN() {
+    if [ "${verbose}" = "y" ] ; then
+        chown -v "$@"
+    else
+        chown "$@"
+    fi
+}
+
 MKDIR() {
     if [ "${verbose}" = "y" ] ; then
         mkdir -v "$@"
@@ -340,10 +348,8 @@ add_pb_repo() {
     cat >${TARGET_DIR}/etc/apt/sources.list.d/profitbricks.list <<EOF
 # ProfitBricks Debian repositories
 
-deb     http://alexandria.pb.local/pb-wheezy production                     main non-free contrib
-deb-src http://alexandria.pb.local/pb-wheezy production                     main non-free contrib
-deb     http://alexandria.pb.local/pb-wheezy production-approved-updates    main non-free contrib
-deb-src http://alexandria.pb.local/pb-wheezy production-approved-updates    main non-free contrib
+deb		http://repo01.pb.local/pb-debian	wheezy			main non-free contrib
+deb		http://repo01.pb.local/pb-debian	wheezy-proposed	main non-free contrib
 
 EOF
 
@@ -409,16 +415,22 @@ copy_files() {
     fi
     CHMOD 0700 ${TARGET_DIR}/root/.ssh
     CP -p files/authorized_keys ${TARGET_DIR}/root/.ssh/
+    CHOWN root:root ${TARGET_DIR}/root/.ssh/authorized_keys
 
     for f in files/inputrc files/modules files/rc.local ; do
-        CP -p ${f} ${TARGET_DIR}/etc
+        b=$(basename ${f})
+        CP -p ${f} ${TARGET_DIR}/etc/${b}
+        CHOWN root:root ${TARGET_DIR}/etc/${b}
     done
 
     for f in files/zlogout files/zshrc ; do
-        CP -p ${f} ${TARGET_DIR}/etc/zsh
+        b=$(basename ${f})
+        CP -p ${f} ${TARGET_DIR}/etc/zsh/${b}
+        CHOWN root:root ${TARGET_DIR}/etc/zsh/${b}
     done
 
     CP -p files/vimrc.local ${TARGET_DIR}/etc/vim/
+    CHOWN root:root ${TARGET_DIR}/etc/vim/vimrc.local
 
     info "Enabling ${GREEN}rc.local${NORMAL} in runlevel ..."
     CHROOT update-rc.d rc.local defaults