--- mcore-src/trunk/mcore-tools/dracut/module-setup.sh 2013/05/08 11:33:33 2054 +++ mcore-src/trunk/mcore-tools/dracut/module-setup.sh 2014/01/10 23:19:49 2212 @@ -4,9 +4,10 @@ local _program . $dracutfunctions - for _program in ifconfig ip mysql 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 alx." + derror "Could not find program \"$_program\" required by mcored." return 1 fi done @@ -79,11 +80,12 @@ #egrep '^lp:' /etc/group >> "$initdir/etc/group" # networking stuff - dracut_install ifconfig ip route udhcpc iwconfig wpa_supplicant + dracut_install ifconfig ip route udhcpc iwconfig wpa_supplicant chroot systemd-nspawn inst /usr/share/udhcpc/default.script + inst_simple "$moddir/net-lib.sh" /lib/net-lib.sh - # alxconfig stuff - dracut_install hwinfo mysql vncpasswd xml + # mcored config stuff + dracut_install hwinfo vncpasswd # mcored # install all busybox modules @@ -100,16 +102,15 @@ inst /etc/ssl/private/mcored.key inst_dir /var/lib/mcored inst /etc/conf.d/mcored - inst /etc/mcore/config.rc + inst /etc/mcore/mcore.conf inst /etc/mcoredpasswd for __file in $(find /usr/lib/mcored/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