--- mcore-src/trunk/mcore-tools/dracut/module-setup.sh	2013/05/08 14:15:35	2066
+++ mcore-src/trunk/mcore-tools/dracut/module-setup.sh.in	2014/01/11 00:33:19	2239
@@ -4,7 +4,8 @@
 	local _program
 	. $dracutfunctions
 
-	for _program in ifconfig ip route udhcpc xml; do
+	for _program in ifconfig ip route udhcpc iwconfig wpa_supplicant \
+		chroot systemd-nspawn vncpasswd hostname mcored; do
 		if ! type -P $_program >/dev/null; then
 			derror "Could not find program \"$_program\" required by mcored."
 			return 1
@@ -74,45 +75,45 @@
 	local __file
 
 	# add lp usr/group
-	egrep '^lp:' /etc/passwd >> "$initdir/etc/passwd"
+	egrep '^lp:' @@SYSCONFDIR@@/passwd >> "$initdir@@SYSCONFDIR@@/passwd"
 	# group file is fully included atm
-	#egrep '^lp:' /etc/group >> "$initdir/etc/group"
+	#egrep '^lp:' @@SYSCONFDIR@@/group >> "$initdir@@SYSCONFDIR@@/group"
 
 	# networking stuff
-	dracut_install ifconfig ip route udhcpc iwconfig wpa_supplicant
-	inst /usr/share/udhcpc/default.script
+	dracut_install ifconfig ip route udhcpc iwconfig wpa_supplicant chroot systemd-nspawn
+	inst @@DATADIR@@/udhcpc/default.script
+	inst_simple "$moddir/net-lib.sh" /lib/net-lib.sh
 
 	# mcored config stuff
-	dracut_install hwinfo vncpasswd xml
+	dracut_install hwinfo vncpasswd
 
 	# mcored
 	# install all busybox modules
 	dracut_install busybox
-	for __file in $(cat /usr/share/busybox/busybox.links)
+	for __file in $(cat @@DATADIR@@/busybox/busybox.links)
 	do
 		inst_symlink ${__file}
 	done
 	# install things which are needed but not provided by our busybox
 	dracut_install find install sslsvd touch
-	inst /etc/mageversion
-	inst /etc/conf.d/network
-	inst /etc/ssl/certs/mcored.pem
-	inst /etc/ssl/private/mcored.key
-	inst_dir /var/lib/mcored
-	inst /etc/conf.d/mcored
-	inst /etc/mcore/config.rc
-	inst /etc/mcoredpasswd
-	for __file in $(find /usr/lib/mcored/include -type f)
+	inst @@SYSCONFDIR@@/mageversion
+	inst @@CONFDDIR@@/network
+	inst @@SSLDIR@@/certs/mcored.pem
+	inst @@SSLDIR@@/private/mcored.key
+	inst_dir @@MCORE_CHROOTDIR@@
+	inst @@CONFDDIR@@/mcored
+	inst @@SYSCONFDIR@@/mcore/mcore.conf
+	inst @@SYSCONFDIR@@/mcoredpasswd
+	for __file in $(find @@MCORE_LIBDIR@@/include -type f)
 	do
-	inst ${__file}
+		inst ${__file}
 	done
-	inst /usr/lib/mcored/mcored
-	inst /usr/lib/mcored/mcore-generate-certificate
-	inst /usr/lib/mcored/mcorepasswd
-	inst /usr/lib/mcored/start-daemon.sh
-	inst /usr/lib/mcored/VERSION
-	inst_symlink /usr/sbin/mcored
-	inst_symlink /usr/bin/mcorepasswd
+	inst @@MCORE_LIBDIR@@/mcored
+	inst @@MCORE_LIBDIR@@/mcore-generate-certificate
+	inst @@MCORE_LIBDIR@@/mcorepasswd
+	inst @@MCORE_LIBDIR@@/VERSION
+	inst_symlink @@SBINDIR@@/mcored
+	inst_symlink @@SBINDIR@@/mcorepasswd
 
 	inst_hook pre-pivot 90 "$moddir"/run-mcored.sh
 }