From 5c209729e7e3fa4858513c525ff4c4bdad309519 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 20 Aug 2013 18:22:48 +0200
Subject: [dnbd3] update requested commit

---
 remote/modules/dnbd3/dnbd3.build | 2 ++
 remote/modules/dnbd3/dnbd3.conf  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'remote/modules')

diff --git a/remote/modules/dnbd3/dnbd3.build b/remote/modules/dnbd3/dnbd3.build
index 5dd2769f..e285788b 100644
--- a/remote/modules/dnbd3/dnbd3.build
+++ b/remote/modules/dnbd3/dnbd3.build
@@ -32,6 +32,8 @@ build() {
 	cd "$MODULE_BUILD_DIR/opt/openslx/bin" || perror "Could not cd to build dir for client binary"
 	cmake "$MODULE_DIR/src/dnbd3" || perror "Could not cmake"
 	make dnbd3-client || perror "Could not make dnbd3-client"
+	chown root:root "dnbd3-client"
+	chmod +xs "dnbd3-client"
 	cd "$MODULE_DIR"
 }
 
diff --git a/remote/modules/dnbd3/dnbd3.conf b/remote/modules/dnbd3/dnbd3.conf
index c1a3eb2e..31c411d0 100644
--- a/remote/modules/dnbd3/dnbd3.conf
+++ b/remote/modules/dnbd3/dnbd3.conf
@@ -2,7 +2,7 @@
 #REQUIRED_CONTENT_PACKAGES="libgconf-2-4 fontconfig-config"
 REQUIRED_MODULES="kernel"
 REQUIRED_GIT="git://git.openslx.org/dnbd3.git"
-REQUIRED_COMMIT="37868b9e5f7c26c61a928a61b7cc705eedb7e5a6"
+REQUIRED_COMMIT="89a7af0ceb1cdc13f7d3a4ffac54f32576e1138d"
 REQUIRED_BINARIES="
 	dnbd3-client
 "
-- 
cgit v1.2.3-55-g7522


From 42f3e47bc5124df57c30cdd127e9c01ae47d929b Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 20 Aug 2013 19:42:20 +0200
Subject: [dnbd3] add systemd service + script to load the module and launch
 the user space daemon

---
 .../dnbd3/data/etc/systemd/system/setup-dnbd3.service        | 12 ++++++++++++
 .../systemd/system/sysinit.target.wants/setup-dnbd3.service  |  1 +
 .../dnbd3/data/opt/openslx/scripts/systemd-setup_dnbd3       |  9 +++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 remote/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service
 create mode 120000 remote/modules/dnbd3/data/etc/systemd/system/sysinit.target.wants/setup-dnbd3.service
 create mode 100755 remote/modules/dnbd3/data/opt/openslx/scripts/systemd-setup_dnbd3

(limited to 'remote/modules')

diff --git a/remote/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service b/remote/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service
new file mode 100644
index 00000000..97f6703d
--- /dev/null
+++ b/remote/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Setup dnbd3 kernel module and user space daemon
+After=sysinit.target
+Before=shutdown.target
+DefaultDependencies=no
+
+[Service]
+Type=service
+ExecStart=/opt/openslx/scripts/systemd-setup_dnbd3
+ExecStop=/opt/openslx/bin/dnbd3-client --kill
+ExecStopPost=/bin/rm /var/run/dnbd3.socket
+Restart=on-abort
diff --git a/remote/modules/dnbd3/data/etc/systemd/system/sysinit.target.wants/setup-dnbd3.service b/remote/modules/dnbd3/data/etc/systemd/system/sysinit.target.wants/setup-dnbd3.service
new file mode 120000
index 00000000..05dd4ac2
--- /dev/null
+++ b/remote/modules/dnbd3/data/etc/systemd/system/sysinit.target.wants/setup-dnbd3.service
@@ -0,0 +1 @@
+../setup-dnbd3.service
\ No newline at end of file
diff --git a/remote/modules/dnbd3/data/opt/openslx/scripts/systemd-setup_dnbd3 b/remote/modules/dnbd3/data/opt/openslx/scripts/systemd-setup_dnbd3
new file mode 100755
index 00000000..9c76bfa6
--- /dev/null
+++ b/remote/modules/dnbd3/data/opt/openslx/scripts/systemd-setup_dnbd3
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+insmod /lib/modules/dnbd3/dnbd3.ko
+[ -e "/dev/dnbd0" ] || exit 1
+for i in 0 1 2 3 4 5 6 7; do
+	echo 8192 > "/sys/block/dnbd${i}/queue/nr_requests"
+done
+exec -- dnbd3-client --daemon
+
-- 
cgit v1.2.3-55-g7522


From 5ecba3429f3c5d75550137eb2c815ebb62dfdffb Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 20 Aug 2013 20:03:34 +0200
Subject: Switch to using /etc/tmpfiles.d for creating files/dirs in /run Also
 added a sanity check after processing each module, which will abort if
 anything is placed in /run directly

---
 remote/modules/kdm/data/etc/tmpfiles.d/kdm.conf        |  2 ++
 remote/modules/kdm/kdm.build                           |  1 -
 remote/modules/pam/data/etc/tmpfiles.d/pipefs.conf     |  2 ++
 remote/modules/pam/pam.build                           | 15 +--------------
 .../modules/plymouth/data/etc/tmpfiles.d/plymouth.conf |  2 ++
 remote/modules/plymouth/plymouth.conf                  |  3 ++-
 remote/modules/sshd/data/etc/tmpfiles.d/sshd.conf      |  2 ++
 remote/rootfs/rootfs-stage32/rootfs-stage32.build      |  4 +++-
 remote/setup_target                                    | 18 ++++--------------
 9 files changed, 18 insertions(+), 31 deletions(-)
 create mode 100644 remote/modules/kdm/data/etc/tmpfiles.d/kdm.conf
 create mode 100644 remote/modules/pam/data/etc/tmpfiles.d/pipefs.conf
 create mode 100644 remote/modules/plymouth/data/etc/tmpfiles.d/plymouth.conf
 create mode 100644 remote/modules/sshd/data/etc/tmpfiles.d/sshd.conf

(limited to 'remote/modules')

diff --git a/remote/modules/kdm/data/etc/tmpfiles.d/kdm.conf b/remote/modules/kdm/data/etc/tmpfiles.d/kdm.conf
new file mode 100644
index 00000000..64f02ed3
--- /dev/null
+++ b/remote/modules/kdm/data/etc/tmpfiles.d/kdm.conf
@@ -0,0 +1,2 @@
+D /var/run/kdm 0755 root root
+
diff --git a/remote/modules/kdm/kdm.build b/remote/modules/kdm/kdm.build
index b5d1be08..feac30cb 100644
--- a/remote/modules/kdm/kdm.build
+++ b/remote/modules/kdm/kdm.build
@@ -16,7 +16,6 @@ build () {
 post_copy() {
 	#create static kdm folders in stage3.2
 	mkdir -p "${TARGET_BUILD_DIR}/var/lib/kdm"
-	mkdir -p "${TARGET_BUILD_DIR}/var/run/kdm"
 	# link kdm config as opensuse wants in in another place
 	ln -s "/etc/kde4" "$TARGET_BUILD_DIR/usr/share/kde4/config"
 
diff --git a/remote/modules/pam/data/etc/tmpfiles.d/pipefs.conf b/remote/modules/pam/data/etc/tmpfiles.d/pipefs.conf
new file mode 100644
index 00000000..7c422623
--- /dev/null
+++ b/remote/modules/pam/data/etc/tmpfiles.d/pipefs.conf
@@ -0,0 +1,2 @@
+D /var/run/rpc_pipefs 0755 root root
+
diff --git a/remote/modules/pam/pam.build b/remote/modules/pam/pam.build
index 063c0065..34319ce8 100644
--- a/remote/modules/pam/pam.build
+++ b/remote/modules/pam/pam.build
@@ -23,18 +23,5 @@ build() {
 }
 
 post_copy() {	
-	if [ ! -d "${TARGET_BUILD_DIR}/run/rpc_pipefs" ]; then
-		mkdir -p "${TARGET_BUILD_DIR}/run/rpc_pipefs" || pwarning "Could not mkdir ${TARGET_BUILD_DIR}/run/rpc_pipefs"
-	fi
-	
-	# find libnfsidmap run-time library directory
-	#local COPYLIST="$MODULE_BUILD_DIR/list_packet_files"
-	#local SEARCH=$(grep "/libsnfsidmap/" "$COPYLIST" | head -1)
-	#[ -z "$SEARCH" ] && perror "Hä"
-	#SEARCH=$(dirname "$SEARCH")
-	#if [ -d "${SEARCH}" ]; then
-	#	tarcopy "${SEARCH}" "${TARGET_BUILD_DIR}" || pinfo "Something went wrong copying $SEARCH"
-	#fi
-
-	
+	:
 }
diff --git a/remote/modules/plymouth/data/etc/tmpfiles.d/plymouth.conf b/remote/modules/plymouth/data/etc/tmpfiles.d/plymouth.conf
new file mode 100644
index 00000000..211c61f6
--- /dev/null
+++ b/remote/modules/plymouth/data/etc/tmpfiles.d/plymouth.conf
@@ -0,0 +1,2 @@
+D /var/run/plymouth 0755 root root
+
diff --git a/remote/modules/plymouth/plymouth.conf b/remote/modules/plymouth/plymouth.conf
index 26e123e4..ec6f8571 100644
--- a/remote/modules/plymouth/plymouth.conf
+++ b/remote/modules/plymouth/plymouth.conf
@@ -9,5 +9,6 @@ REQUIRED_DIRECTORIES="
 	/etc
 	/lib
 	/sbin
-	/var
+	/var/lib
+	/var/spool
 "
diff --git a/remote/modules/sshd/data/etc/tmpfiles.d/sshd.conf b/remote/modules/sshd/data/etc/tmpfiles.d/sshd.conf
new file mode 100644
index 00000000..d4aa9a67
--- /dev/null
+++ b/remote/modules/sshd/data/etc/tmpfiles.d/sshd.conf
@@ -0,0 +1,2 @@
+D /var/run/sshd 0755 root root
+
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
index f9749740..99cb86f7 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
@@ -65,7 +65,9 @@ post_copy() {
 	[ ! -e "$TARGET_BUILD_DIR/bin/mount" ] && ln -s /usr/bin/mount "$TARGET_BUILD_DIR/bin/mount"
 	
 	# make basic directory structure
-	mkdir -p "${TARGET_BUILD_DIR}"/{bin,dev,proc,lib,etc,mnt,sys,var/run,var/lock,var/log,run/lock,run/shm,opt/openslx/mnt}
+	mkdir -p "$TARGET_BUILD_DIR"/{bin,dev,proc,lib,etc,mnt,sys,var,opt/openslx/mnt}
+	ln -sf "/run/lock" "$TARGET_BUILD_DIR/var/lock"
+	ln -sf "/run" "$TARGET_BUILD_DIR/var/run"
 
 	# make openslx log directory
 	mkdir -p "${TARGET_BUILD_DIR}"/var/log/openslx
diff --git a/remote/setup_target b/remote/setup_target
index 8160de3e..1b857eda 100755
--- a/remote/setup_target
+++ b/remote/setup_target
@@ -362,6 +362,10 @@ process_module() {
 		copy_static_data
 		pinfo "## Post copy"
 		post_copy
+		# Sanity checks
+		[ -e "$TARGET_BUILD_DIR/var/run" -a ! -L "$TARGET_BUILD_DIR/var/run" ] && perror "Messup datected: $TARGET_BUILD_DIR/var/run exists and is not a symlink!"
+		[ -e "$TARGET_BUILD_DIR/var/lock" -a ! -L "$TARGET_BUILD_DIR/var/lock" ] && perror "Messup datected: $TARGET_BUILD_DIR/var/lock exists and is not a symlink!"
+		[ -n "$(ls -A "$TARGET_BUILD_DIR/run")" ] && perror "Messup detected: $TARGET_BUILD_DIR/run is not empty. You cannot place static files there, use /etc/tmpfiles.d instead!"
 		# set MODULE_BUILD_SIZE
 		calc_size
 		pinfo "Module completed. Total size: ${MODULE_BUILD_SIZE}"
@@ -408,20 +412,6 @@ post_process_target() {
 	ldconfig -v -r "${TARGET_BUILD_DIR}" -f "/ldconf-temp"
 	unlink "$LDTEMP"
 
-	# Hacky way of making sure /run and /var/run are actually the same directory
-	local DIR_RUN="$TARGET_BUILD_DIR/run"
-	local DIR_VAR_RUN="$TARGET_BUILD_DIR/var/run"
-	[ -L "$DIR_RUN" ] && perror "$DIR_RUN is a symbolic link, refusing to work!"
-	if [ -d "$DIR_RUN" -o -d "$DIR_VAR_RUN" ]; then
-		mkdir -p "$DIR_RUN" || perror "Could not create $DIR_RUN"
-		if [ -d "$DIR_VAR_RUN" -a ! -L "$DIR_VAR_RUN" ]; then
-			mv "$DIR_VAR_RUN/"* "$DIR_RUN/" || perror "Could not move contents of $DIR_VAR_RUN to $DIR_RUN"
-			rmdir "$DIR_VAR_RUN" || perror "Could not delete $DIR_VAR_RUN after moving contents to $DIR_RUN"
-		fi
-		if [ ! -L "$DIR_VAR_RUN" ]; then
-			ln -sf "../run" "$DIR_VAR_RUN" || perror "Could not create symbolic link $DIR_VAR_RUN to ../run"
-		fi
-	fi
 }
 
 clean_modules() {
-- 
cgit v1.2.3-55-g7522


From b3bd794b4f4b2d6dcc8f42e871a463facb8786da Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 20 Aug 2013 21:12:03 +0200
Subject: [vmchooser] Add support for dnbd3 (if servers are specified in
 config) Also add fallback if MAC address is not present in config

---
 .../data/opt/openslx/scripts/systemd-vmchooser_env |  6 ++-
 .../data/opt/openslx/scripts/vmchooser-run_virt    | 46 +++++++++++++++++++---
 .../data/opt/openslx/etc/vmware/run-virt.include   | 19 +++++----
 3 files changed, 57 insertions(+), 14 deletions(-)

(limited to 'remote/modules')

diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/systemd-vmchooser_env b/remote/modules/vmchooser/data/opt/openslx/scripts/systemd-vmchooser_env
index 50eace20..4119ad9c 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/systemd-vmchooser_env
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/systemd-vmchooser_env
@@ -91,7 +91,11 @@ if grep -q ^flags.*\\\<vmx\\\> /proc/cpuinfo; then
 fi
 
 # write mac
-echo "hostmacaddr=${SLX_PXE_MAC}" >> ${VMCHOOSER_CONF_DIR}/virtualization.conf
+if [ -n "$SLX_PXE_MAC" ]; then
+	echo "hostmacaddr=${SLX_PXE_MAC}" >> ${VMCHOOSER_CONF_DIR}/virtualization.conf
+else ## Fallback:
+	echo "hostmacaddr=$(ip a | grep ether | grep -o -E -i '([0-9a-f]{2}:){5}[0-9a-f]{2}' | head -n 1)" >> ${VMCHOOSER_CONF_DIR}/virtualization.conf
+fi
 # ip addr
 echo "hostip=${SLX_PXE_CLIENT_IP}" >> ${VMCHOOSER_CONF_DIR}/virtualization.conf
 # hostname
diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
index 979db35a..f6e4e491 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
@@ -23,11 +23,11 @@
 ################################################################################
 
 # include general configuration from vmchooser
-[ -f /opt/openslx/etc/vmchooser/vmchooser.conf ] && \
-. /opt/openslx/etc/vmchooser/vmchooser.conf
+[ -f /opt/openslx/etc/vmchooser/vmchooser.conf ] && . /opt/openslx/etc/vmchooser/vmchooser.conf
 # load general virtualization information
-[ -f /opt/openslx/etc/vmchooser/virtualization.conf ] && \
-. /opt/openslx/etc/vmchooser/virtualization.conf
+[ -f /opt/openslx/etc/vmchooser/virtualization.conf ] && . /opt/openslx/etc/vmchooser/virtualization.conf
+# Load general openslx config
+[ -f /opt/openslx/config ] && . /opt/openslx/config
 
 ################################################################################
 ### Functions used throughout the script
@@ -359,8 +359,9 @@ hostmem="$[ $totalmem - $mem ]"
 # last two bytes are taken from the bridge of the host
 # define one MAC per guest
 macguestpart="00:50:56:${VM_ID}"
-machostpart=$(echo ${hostmacaddr} | awk -F ":" '{print $(NF-1)":"$NF}')
+machostpart=$(echo "${hostmacaddr}" | awk -F ":" '{print $(NF-1)":"$NF}')
 macaddr=$(echo "${macguestpart}:${machostpart}" | tr "[a-z]" "[A-Z]")
+macaddrsuffix=$(echo "${VM_ID}:${machostpart}" | tr "[a-z]" "[A-Z]")
 
 # Virtual fd/cd/dvd and drive devices, floppy b: for configuration
 # if $floppy_0 from run-virt.include set then fdtest="TRUE"
@@ -432,6 +433,32 @@ cp "$xmlfile" "/opt/openslx/etc/vmchooser/fd-loop/config.xml"
 # Add another file with resolution information
 xrandr | grep -o -E 'current\s*[0-9]+\s*x\s*[0-9]+' | cut -c 8- | sed -r 's/(\s|\t|\n)//g' | head -n 1 > "/opt/openslx/etc/vmchooser/fd-loop/hostres.txt"
 
+# Try to use dnbd3 to access the image
+unset vm_diskfile
+unset vm_revision
+unset dnbd3
+if [ -n "$SLX_DNBD3_SERVERS" ]; then
+	if [ -e "/dev/dnbd0" -a -e "/var/run/dnbd3.socket" ]; then
+		for SRV in $SLX_DNBD3_SERVERS; do
+			dnbd3=$(dnbd3-client -h "$SRV" -i "${vmpath#/mnt/vmstore/}" -r 0)
+			RET=$?
+			if [ "$RET" = "0" ]; then
+				vm_diskfile="$dnbd3"
+				vm_revision=$(cat "/sys/block/${dnbd3#/dev/}/net/rid")
+				writelog "DNBD3: $vm_diskfile on $dnbd3 with rid $vm_revision"
+				break
+			fi
+		done
+		[ -z "$vm_diskfile" ] && writelog "No working dnbd3 server found :-("
+	else
+		writelog "Won't use dnbd3 as it's not loaded, or the daemon is not running..."
+	fi
+else
+	writelog "Won't use dnbd3 as no servers are given in config"
+fi
+[ -z "$vm_diskfile" ] && vm_diskfile="$vmpath"
+writelog "Used diskfile: $vm_diskfile"
+
 # Get all virtual machine specific stuff from the respective include file
 if [ -e /opt/openslx/etc/"${xmlvirt}"/run-virt.include ] ; then
 	self="${xmlvirt}"
@@ -463,6 +490,15 @@ if [ -e /opt/openslx/etc/"${xmlvirt}"/run-virt.include ] ; then
 	if [ -n "${POSTRUN}" ]; then
 		eval ${POSTRUN}  >/dev/null 2>&1
 	fi
+
+	# Disconnect dnbd3 device
+	if [ -n "$dnbd3" ]; then
+		for timeout in 1 1 2; do
+			dnbd3-client -c "$dnbd3" && break
+			writelog "dnbd3 still busy...."
+			sleep "$timeout"
+		done
+	fi
 	
 	cleanexit 0
 else
diff --git a/remote/modules/vmplayer/data/opt/openslx/etc/vmware/run-virt.include b/remote/modules/vmplayer/data/opt/openslx/etc/vmware/run-virt.include
index 084828ff..b755133f 100755
--- a/remote/modules/vmplayer/data/opt/openslx/etc/vmware/run-virt.include
+++ b/remote/modules/vmplayer/data/opt/openslx/etc/vmware/run-virt.include
@@ -229,7 +229,7 @@ MemTrimRate = "-1"
 
 # ide-disks
 ide0:0.present = "$ide"
-ide0:0.fileName = "$diskfile"
+ide0:0.fileName = "$vm_diskfile"
 ## Edited for persistent mode.
 ide0:0.mode = "independent-${diskmode}"
 ##
@@ -245,7 +245,7 @@ ide1:1.deviceType = "cdrom-raw"
 # scsi-disks
 scsi0.present = "$scsi"
 scsi0:0.present = "$scsi"
-scsi0:0.fileName = "$diskfile"
+scsi0:0.fileName = "$vm_diskfile"
 scsi0.virtualDev = "$hddrv"
 ## Edited for persistent mode.
 scsi0:0.mode = "independent-${diskmode}"$stateFileConfiguration
@@ -270,7 +270,7 @@ $network_virtualDev
 ethernet0.connectionType = "$network_kind"
 #ethernet1.connectionType = "custom"
 #ethernet1.vnet = "/dev/vmnet2"
-ethernet0.address = "00:50:56:$VM_ID:$machostpart"
+ethernet0.address = "00:50:56:$macaddrsuffix"
 ethernet0.wakeOnPcktRcv = "FALSE"
 
 # sound
@@ -627,11 +627,14 @@ writelog ""
 ################################################################################
 
 # configure and start samba service to provide user's home directory
-if [ -f /usr/sbin/smbd ] ; then
-	sudo /opt/openslx/bin/sed -i /etc/vmware/smb.conf -e "s,USER,$USER,"
-	sudo /usr/sbin/nmbd -s /etc/vmware/smb.conf
-	sudo /usr/sbin/smbd -s /etc/vmware/smb.conf
-fi
+#if [ -f /usr/sbin/smbd ] ; then
+#	sudo /opt/openslx/bin/sed -i /etc/vmware/smb.conf -e "s,USER,$USER,"
+#	sudo /usr/sbin/nmbd -s /etc/vmware/smb.conf
+#	sudo /usr/sbin/smbd -s /etc/vmware/smb.conf
+#fi
+
+# For debugging
+cp "$conffile" "/tmp/vmware-last-config"
 
 # using the modified version of the wrapper script
 VIRTCMD="/opt/openslx/bin/vmplayer"
-- 
cgit v1.2.3-55-g7522


From 282ab9dfe046b3eaecf84c06658492c4c83d2849 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 21 Aug 2013 12:30:23 +0200
Subject: [systemd] Fix path of 'ip' in service file

---
 .../modules/systemd/data/etc/systemd/system/network-interface@.service | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'remote/modules')

diff --git a/remote/modules/systemd/data/etc/systemd/system/network-interface@.service b/remote/modules/systemd/data/etc/systemd/system/network-interface@.service
index 13a30bbc..77bbd287 100644
--- a/remote/modules/systemd/data/etc/systemd/system/network-interface@.service
+++ b/remote/modules/systemd/data/etc/systemd/system/network-interface@.service
@@ -5,4 +5,5 @@ Before=udhcpc@%i.service
 
 [Service]
 Type=simple
-ExecStart=/opt/openslx/bin/ip link set dev %I up
+ExecStart=/opt/openslx/sbin/ip link set dev %I up
+
-- 
cgit v1.2.3-55-g7522


From 72dcfc61bf3159c9e5ddd4207fbb75685677f91d Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 21 Aug 2013 13:48:31 +0200
Subject: [sshd] don't touch /var/run!

---
 remote/modules/sshd/sshd.build | 1 -
 1 file changed, 1 deletion(-)

(limited to 'remote/modules')

diff --git a/remote/modules/sshd/sshd.build b/remote/modules/sshd/sshd.build
index 89dcd386..ebf42c12 100644
--- a/remote/modules/sshd/sshd.build
+++ b/remote/modules/sshd/sshd.build
@@ -14,7 +14,6 @@ build() {
 }
 
 post_copy() {
-	mkdir -p "${TARGET_BUILD_DIR}/var/run/sshd" # ubuntu
 	mkdir -p "${TARGET_BUILD_DIR}/var/lib/empty" # suse
 
 	chmod go-rwx "${TARGET_BUILD_DIR}/etc/ssh/"* # no space, " before *
-- 
cgit v1.2.3-55-g7522


From 65971818a573c47f182de461092d60bf1c63cc2b Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 21 Aug 2013 16:28:42 +0200
Subject: [rootfs-stage32] Make it possible to run a script after adding an
 addon to the aufs stack. Call it addon-init and place it in the root
 directory of your addon [vmplayer] Add such an addon-init script that will
 take care of setting up the vmplayer environment

---
 remote/modules/vmplayer/data/addon-init               |  5 +++++
 remote/rootfs/rootfs-stage31/data/bin/setup_stage32   |  4 ++++
 .../data/opt/openslx/scripts/systemd-setup_slx_addons | 19 ++++++++++++++-----
 3 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100755 remote/modules/vmplayer/data/addon-init

(limited to 'remote/modules')

diff --git a/remote/modules/vmplayer/data/addon-init b/remote/modules/vmplayer/data/addon-init
new file mode 100755
index 00000000..01acb3b4
--- /dev/null
+++ b/remote/modules/vmplayer/data/addon-init
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+systemctl daemon-reload
+systemctl start vmware
+
diff --git a/remote/rootfs/rootfs-stage31/data/bin/setup_stage32 b/remote/rootfs/rootfs-stage31/data/bin/setup_stage32
index 151617bc..bc00b830 100755
--- a/remote/rootfs/rootfs-stage31/data/bin/setup_stage32
+++ b/remote/rootfs/rootfs-stage31/data/bin/setup_stage32
@@ -45,3 +45,7 @@ mount -n -t aufs -o "br:${FUTURE_ROOT}:${STAGE32_MOUNT_POINT}=ro" none /mnt || d
 mkdir -p /mnt/opt/openslx/uniontmp /mnt/tmp
 mount -n --move "$FUTURE_ROOT" /mnt/opt/openslx/uniontmp || drop_shell "Problem moving uniontmp."
 FUTURE_ROOT="/mnt"
+
+# "Delete" addon hook-script in aufs view
+touch "/mnt/opt/openslx/uniontmp/.wh.addon-init"
+
diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons
index 70a09924..a5dc9965 100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons
@@ -25,20 +25,29 @@ fi
 SLX_BASE_PATH=$(read_from_cmdline "slxbase")
 
 SLX_BASE_MNT="/opt/openslx/mnt"
-SYS_TMP="/tmp"
+SYS_TMP="/tmp/addons"
+mkdir -p "$SYS_TMP" || { echo "Failed to create $SYS_TMP"; exit 1; }
 
 for ADDON in ${SLX_ADDONS}; do
 	# download the addon from the given URL
-	ADDON_TARGET_PATH="${SYS_TMP}/$(basename $(echo ${ADDON})).sqfs"
+	ADDON_TARGET_PATH="${SYS_TMP}/$(basename "$ADDON").sqfs"
 	download "${SLX_BASE_PATH}/${ADDON}.sqfs" "${ADDON_TARGET_PATH}"
 
 	# now mount it to $SLX_MNT/<addon-name>
-	ADDON_MOUNT_POINT="${SLX_BASE_MNT}/$(basename $(echo ${ADDON}) | awk -F "." '{print $1}')"
+	ADDON_MOUNT_POINT="${SLX_BASE_MNT}/$(basename "$ADDON")"
 	mkdir -p "$ADDON_MOUNT_POINT"
 	echo "Mounting ${ADDON_TARGET_PATH} to ${ADDON_MOUNT_POINT}"
-	mount -t squashfs "$ADDON_TARGET_PATH" ${ADDON_MOUNT_POINT} || { echo "Failed to mount." && exit 1; }
+	mount -t squashfs "$ADDON_TARGET_PATH" "$ADDON_MOUNT_POINT" || { echo "Failed to mount." && exit 1; }
 
 	# now append it to /
 	echo "Appending ${ADDON_MOUNT_POINT} to /"
-	mount -o remount,append:${ADDON_MOUNT_POINT}=ro / || { echo "Fail." && exit 1; }
+	mount -o "remount,append:${ADDON_MOUNT_POINT}=ro" / || { echo "Fail." && exit 1; }
+
+	# Run post-hook if available
+	if [ -x "$ADDON_MOUNT_POINT/addon-init" ]; then
+		echo "Running addon initialization script..."
+		"$ADDON_MOUNT_POINT/addon-init" || echo "Warning: Could not execute addon-init of $ADDON"
+	fi
 done
+exit 0
+
-- 
cgit v1.2.3-55-g7522