From 814c24537b7cef2550de9a72fbc193233b0c7e19 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 1 Feb 2013 17:52:53 +0100
Subject: german keymap

---
 remote/tools/base/data/etc/keymaps/de_DE | Bin 0 -> 2823 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 remote/tools/base/data/etc/keymaps/de_DE

(limited to 'remote/tools/base')

diff --git a/remote/tools/base/data/etc/keymaps/de_DE b/remote/tools/base/data/etc/keymaps/de_DE
new file mode 100644
index 00000000..375c2012
Binary files /dev/null and b/remote/tools/base/data/etc/keymaps/de_DE differ
-- 
cgit v1.2.3-55-g7522


From 606e20297bc3ebb6f6432178c42de5ac859d7d10 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 8 Feb 2013 17:34:49 +0100
Subject: [base] mount.aufs & mount.nfs

---
 remote/tools/base/base.build | 23 +++++++++++++++++------
 remote/tools/base/base.conf  | 13 ++++++++++---
 2 files changed, 27 insertions(+), 9 deletions(-)

(limited to 'remote/tools/base')

diff --git a/remote/tools/base/base.build b/remote/tools/base/base.build
index 91cbfa3f..88d19684 100644
--- a/remote/tools/base/base.build
+++ b/remote/tools/base/base.build
@@ -17,8 +17,16 @@ build() {
 	for BIN in ${REQUIRED_BINARIES}
 	do
 		BIN_LOCATION=$(which ${BIN})
-		[ -e ${BIN_LOCATION} ] && echo ${BIN_LOCATION} >> ${FILELIST}
-		[ -L ${BIN_LOCATION} ] && echo $(readlink ${BIN_LOCATION}) >> ${FILELIST}
+		if [ ! -z ${BIN_LOCATION} -a -e ${BIN_LOCATION} ];
+		then
+			echo "[$TOOL] Processing $BIN at $BIN_LOCATION ..."
+			echo ${BIN_LOCATION} >> ${FILELIST} 
+			[ -L ${BIN_LOCATION} ] \
+				&& echo "[$TOOL] ${BIN_LOCATION} is a symbolic link, copying $(readlink -f ${BIN_LOCATION})" \
+				&& echo $(readlink -f ${BIN_LOCATION}) >> ${FILELIST}
+		else
+			echo "[$TOOL] ${BIN} not found on the system!"
+		fi
 	done
 
 	for LIB in ${REQUIRED_LIBRARIES}
@@ -38,7 +46,9 @@ build() {
 		[ ! -d ${FILE} ] && echo ${FILE} >> ${FILELIST}
 	done
 
-	tar -cpv $(cat ${FILELIST}) | tar -xpv -C ${BUILDDIR} &>/dev/null
+	echo "[$TOOL] File list generated as ${BUILDDIR}/${FILELIST}."
+	echo "--------------------------------------------------------------------"
+	(tar -cpv $(cat ${FILELIST}) | tar -xpv -C ${BUILDDIR}) &>/dev/null
 }
 
 post_copy() {
@@ -58,13 +68,13 @@ post_copy() {
 	cp -r ${TOOL_DIR}/${TOOL}/data/* ${INIT_DIR}
 
 	# copy pam modules, TODO: better way to find arch-dependant interfix...
-        tar -cpv $(dirname $(locate pam_unix.so|grep ^/lib/)) | tar -xpv -C ${INIT_DIR} &>/dev/null
+        (tar -cpv $(dirname $(locate pam_unix.so|grep ^/lib/)) | tar -xpv -C ${INIT_DIR}) &>/dev/null
 
 	# quick fix for /etc/fstab
 	echo "# no configuration" >> ${INIT_DIR}/etc/fstab
 
 	# link /etc/mtab, needed for systemd
-	ln -s /proc/self/mounts ${INIT_DIR}/etc/mtab	
+	[ ! -e ${INIT_DIR}/etc/mtab ] && ln -s /proc/self/mounts ${INIT_DIR}/etc/mtab	
 
 	# quick fix for missing group in /etc/group
 	echo "lock:x:128:" >> ${INIT_DIR}/etc/group
@@ -80,5 +90,6 @@ post_copy() {
 	#cp -r /lib/modules/$(uname -r) ${INIT_DIR}/lib/modules/$(uname -r)
 
 	#quick fix xterm symlink 
-	ln -s /usr/lib/libXaw7.so.7.0.0 ${INIT_DIR}/usr/lib/libXaw7.so.7
+	[ -e /usr/lib/libXaw7.so.7.0.0 ] && \
+		ln -s /usr/lib/libXaw7.so.7.0.0 ${INIT_DIR}/usr/lib/libXaw7.so.7
 }
diff --git a/remote/tools/base/base.conf b/remote/tools/base/base.conf
index 5e97fe51..4322aa73 100644
--- a/remote/tools/base/base.conf
+++ b/remote/tools/base/base.conf
@@ -8,6 +8,9 @@ REQUIRED_BINARIES="	bash
 			sulogin
 			mount
 			umount
+			mount.nfs
+			mount.aufs
+			umount.aufs
 			rm
 			ldd
 			strace
@@ -31,10 +34,13 @@ REQUIRED_LIBRARIES="	libcap
 			libpam
 			libutil
 			libtinfo
-			libresolv"
+			libresolv
+			libau"
 REQUIRED_DIRECTORIES="	/etc/pam.d
 			/etc/security"
-REQUIRED_FILES="	/etc/passwd
+REQUIRED_FILES="	/sbin/mount.nfs4
+			/sbin/umount.nfs4
+			/etc/passwd
 			/etc/shadow
 			/etc/group
 			/etc/hostname
@@ -45,4 +51,5 @@ REQUIRED_FILES="	/etc/passwd
 			/etc/login.defs
 			/etc/nsswitch.conf
 			/etc/securetty
-			/etc/default/locale"
+			/etc/default/locale
+			/etc/default/aufs"
-- 
cgit v1.2.3-55-g7522


From 9a374e9ca134a543467ab96796dae26f13b0d975 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 8 Feb 2013 18:11:33 +0100
Subject: [base] ssh, sshd, scp

---
 remote/tools/base/base.conf | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'remote/tools/base')

diff --git a/remote/tools/base/base.conf b/remote/tools/base/base.conf
index 4322aa73..83cd989a 100644
--- a/remote/tools/base/base.conf
+++ b/remote/tools/base/base.conf
@@ -18,7 +18,10 @@ REQUIRED_BINARIES="	bash
 			modprobe
 			xterm
 			rsyslogd
-			ps"
+			ps
+			sshd
+			scp
+			ssh"
 REQUIRED_LIBRARIES="	libcap
 			libcidn
 			libcom_err
@@ -52,4 +55,7 @@ REQUIRED_FILES="	/sbin/mount.nfs4
 			/etc/nsswitch.conf
 			/etc/securetty
 			/etc/default/locale
-			/etc/default/aufs"
+			/etc/default/aufs
+			/etc/protocols
+			/etc/services
+			/etc/networks"
-- 
cgit v1.2.3-55-g7522


From b548eacd4b737d07a01e575b91e33a045284b98f Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 8 Feb 2013 18:36:01 +0100
Subject: [base] fix for mounting nfs

---
 remote/tools/base/base.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'remote/tools/base')

diff --git a/remote/tools/base/base.conf b/remote/tools/base/base.conf
index 83cd989a..9c1500ff 100644
--- a/remote/tools/base/base.conf
+++ b/remote/tools/base/base.conf
@@ -58,4 +58,5 @@ REQUIRED_FILES="	/sbin/mount.nfs4
 			/etc/default/aufs
 			/etc/protocols
 			/etc/services
-			/etc/networks"
+			/etc/networks
+			/etc/netconfig"
-- 
cgit v1.2.3-55-g7522


From dc54111382adcf4afc2539d2dc8ac0f822906c9e Mon Sep 17 00:00:00 2001
From: root
Date: Tue, 12 Feb 2013 14:28:02 +0100
Subject: [systemd] service files for: network interface, udhcpc, nfs mount

---
 remote/tools/base/base.build                               |  2 +-
 .../data/etc/systemd/system/network-interface@.service     |  8 ++++++++
 .../tools/systemd/data/etc/systemd/system/network@.service | 14 --------------
 .../systemd/data/etc/systemd/system/openslx-mnt.mount      |  8 ++++++++
 .../tools/systemd/data/etc/systemd/system/udhcpc@.service  |  9 +++++++++
 .../systemd/system/udhcpc@.service.wants/openslx-mnt.mount |  1 +
 .../systemd/data/usr/lib/udev/rules.d/99-systemd.rules     |  2 +-
 7 files changed, 28 insertions(+), 16 deletions(-)
 create mode 100644 remote/tools/systemd/data/etc/systemd/system/network-interface@.service
 delete mode 100644 remote/tools/systemd/data/etc/systemd/system/network@.service
 create mode 100644 remote/tools/systemd/data/etc/systemd/system/openslx-mnt.mount
 create mode 100644 remote/tools/systemd/data/etc/systemd/system/udhcpc@.service
 create mode 120000 remote/tools/systemd/data/etc/systemd/system/udhcpc@.service.wants/openslx-mnt.mount

(limited to 'remote/tools/base')

diff --git a/remote/tools/base/base.build b/remote/tools/base/base.build
index 88d19684..70f612b4 100644
--- a/remote/tools/base/base.build
+++ b/remote/tools/base/base.build
@@ -54,7 +54,7 @@ build() {
 post_copy() {
 	
 	# make basic directory structure
-	mkdir -p ${INIT_DIR}/{bin,dev,proc,lib,etc,mnt,sys,var/run,var/lock,var/log,run/lock,run/shm}
+	mkdir -p ${INIT_DIR}/{bin,dev,proc,lib,etc,mnt,sys,var/run,var/lock,var/log,run/lock,run/shm,openslx/mnt}
 
 	# copy devices from running system
 	cp -a /dev/{console,kmsg,mem,null,shm,tty,tty0,tty1,tty9,fb0,urandom,zero} \
diff --git a/remote/tools/systemd/data/etc/systemd/system/network-interface@.service b/remote/tools/systemd/data/etc/systemd/system/network-interface@.service
new file mode 100644
index 00000000..b3c67d09
--- /dev/null
+++ b/remote/tools/systemd/data/etc/systemd/system/network-interface@.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Brings interface %i up
+Wants=udhcpc@%i.service
+Before=udhcpc@%i.service
+
+[Service]
+Type=simple
+ExecStart=/openslx/bin/ip link set dev %I up
diff --git a/remote/tools/systemd/data/etc/systemd/system/network@.service b/remote/tools/systemd/data/etc/systemd/system/network@.service
deleted file mode 100644
index db8169c1..00000000
--- a/remote/tools/systemd/data/etc/systemd/system/network@.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Setup Network Connection
-Wants=network.target
-Before=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/openslx/bin/ip link set dev %I up
-# We should have our own extended udhcpc script here (see stuff in ip-dns-conf)
-ExecStart=/openslx/sbin/udhcpc -O domain -O nissrv -O nisdomain -t 8 -s /etc/udhcpc.default.script -i %I
-
-[Install]
-WantedBy=multi-user.target
diff --git a/remote/tools/systemd/data/etc/systemd/system/openslx-mnt.mount b/remote/tools/systemd/data/etc/systemd/system/openslx-mnt.mount
new file mode 100644
index 00000000..995f123f
--- /dev/null
+++ b/remote/tools/systemd/data/etc/systemd/system/openslx-mnt.mount
@@ -0,0 +1,8 @@
+[Unit]
+Description=Mount NFS Share [TEST]
+
+[Mount]
+What=132.230.4.6:/srv/openslx/export/nfs/ubuntu-12.04-test
+Where=/openslx/mnt
+Type=nfs
+Options=ro,async,nolock
diff --git a/remote/tools/systemd/data/etc/systemd/system/udhcpc@.service b/remote/tools/systemd/data/etc/systemd/system/udhcpc@.service
new file mode 100644
index 00000000..6c5c289b
--- /dev/null
+++ b/remote/tools/systemd/data/etc/systemd/system/udhcpc@.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=DHCP Client
+
+[Service]
+Type=simple
+ExecStart=/openslx/sbin/udhcpc -O domain -O nissrv -O nisdomain -t 8 -s /etc/udhcpc.default.script -i %I
+
+[Install]
+WantedBy=multi-user.target
diff --git a/remote/tools/systemd/data/etc/systemd/system/udhcpc@.service.wants/openslx-mnt.mount b/remote/tools/systemd/data/etc/systemd/system/udhcpc@.service.wants/openslx-mnt.mount
new file mode 120000
index 00000000..70ba668d
--- /dev/null
+++ b/remote/tools/systemd/data/etc/systemd/system/udhcpc@.service.wants/openslx-mnt.mount
@@ -0,0 +1 @@
+../openslx-mnt.mount
\ No newline at end of file
diff --git a/remote/tools/systemd/data/usr/lib/udev/rules.d/99-systemd.rules b/remote/tools/systemd/data/usr/lib/udev/rules.d/99-systemd.rules
index 52377d1f..387a5754 100644
--- a/remote/tools/systemd/data/usr/lib/udev/rules.d/99-systemd.rules
+++ b/remote/tools/systemd/data/usr/lib/udev/rules.d/99-systemd.rules
@@ -31,7 +31,7 @@ SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_T
 #
 # http://git.kernel.org/?p=linux/hotplug/udev.git;a=blob;f=libudev/libudev-enumerate.c;h=da831449dcaf5e936a14409e8e68ab12d30a98e2;hb=HEAD#l742
 
-SUBSYSTEM=="net", KERNEL!="lo", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/net/devices/$name", ENV{SYSTEMD_WANTS}="network@$name.service"
+SUBSYSTEM=="net", KERNEL!="lo", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/net/devices/$name", ENV{SYSTEMD_WANTS}="network-interface@$name.service"
 SUBSYSTEM=="bluetooth", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/bluetooth/devices/%k"
 
 SUBSYSTEM=="bluetooth", TAG+="systemd", ENV{SYSTEMD_WANTS}="bluetooth.target"
-- 
cgit v1.2.3-55-g7522


From 6d81b8042a99552a753a3adc863f9b78bd3e57f3 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 13 Feb 2013 16:18:27 +0100
Subject: fix for home/pos1/etc...

---
 remote/tools/base/base.conf | 1 +
 1 file changed, 1 insertion(+)

(limited to 'remote/tools/base')

diff --git a/remote/tools/base/base.conf b/remote/tools/base/base.conf
index 9c1500ff..8b5fe899 100644
--- a/remote/tools/base/base.conf
+++ b/remote/tools/base/base.conf
@@ -50,6 +50,7 @@ REQUIRED_FILES="	/sbin/mount.nfs4
 			/etc/environment
 			/etc/pam.conf
 			/etc/issue
+			/etc/inputrc
 			/etc/localtime
 			/etc/login.defs
 			/etc/nsswitch.conf
-- 
cgit v1.2.3-55-g7522


From ee6004840abc0b4f5d29f88fbc100854e6b99a24 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 13 Feb 2013 19:01:58 +0100
Subject: TODOS: find triplet name

---
 remote/tools/base/base.build                       | 1 +
 remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.build | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'remote/tools/base')

diff --git a/remote/tools/base/base.build b/remote/tools/base/base.build
index 70f612b4..95b9de65 100644
--- a/remote/tools/base/base.build
+++ b/remote/tools/base/base.build
@@ -67,6 +67,7 @@ post_copy() {
 	# copy static files
 	cp -r ${TOOL_DIR}/${TOOL}/data/* ${INIT_DIR}
 
+	# better: dirname $(ldd $SHELL|grep libc | awk -F " " '{print $3}')
 	# copy pam modules, TODO: better way to find arch-dependant interfix...
         (tar -cpv $(dirname $(locate pam_unix.so|grep ^/lib/)) | tar -xpv -C ${INIT_DIR}) &>/dev/null
 
diff --git a/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.build b/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.build
index 8ddc2e55..fdaba33b 100644
--- a/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.build
+++ b/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.build
@@ -46,8 +46,9 @@ build () {
 }
 
 post_copy() {
-	#copyi static data files
+	#copy static data files
 	cp -r ${TOOL_DIR}/${TOOL}/data/* ${INIT_DIR}
+	# TODO: FIX PATH TO TRIPLET...
 	gdk-pixbuf-query-loaders > ${INIT_DIR}/usr/lib/i386-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders.cache
 	pango-querymodules > ${INIT_DIR}/etc/pango/pango.modules
 	gtk-update-icon-cache-3.0 ${INIT_DIR}/usr/share/icons/hicolor/
-- 
cgit v1.2.3-55-g7522