Reflect new style of setting up flavours in ezjail-admin

This commit is contained in:
erdgeist 2011-11-07 04:33:27 +00:00
parent e717ae669a
commit cedf263041

View File

@ -668,18 +668,17 @@ create)
# if the packages are links and not files we have to copy them now # if the packages are links and not files we have to copy them now
find "${ezjail_rootdir}/pkg/" -type l -exec cp -r -f {} {}.ezjail \; -exec mv {}.ezjail {} \; find "${ezjail_rootdir}/pkg/" -type l -exec cp -r -f {} {}.ezjail \; -exec mv {}.ezjail {} \;
# If a config is found, make it auto run on jails startup # If an old style flavour config is found, make it auto run on jails startup
if [ -f "${ezjail_rootdir}/ezjail.flavour" ]; then if [ -f "${ezjail_rootdir}/ezjail.flavour" ]; then
chmod 0755 "${ezjail_rootdir}/ezjail.flavour" chmod 0755 "${ezjail_rootdir}/ezjail.flavour"
mv "${ezjail_rootdir}/ezjail.flavour" "${ezjail_rootdir}/ezjail.flavour".`printf %04d $(( installed_flavours+=1 ))` mv "${ezjail_rootdir}/ezjail.flavour" "${ezjail_rootdir}/ezjail.flavour".`printf %04d $(( installed_flavours+=1 ))`
echo "Note: Shell scripts for flavour ${ezjail_flavour} installed, flavourizing on jails first startup." echo "Note: Shell scripts for flavour ${ezjail_flavour} installed, flavourizing on jails first startup."
fi
cat > "${ezjail_rootdir}/etc/rc.d/ezjail-config" <<"EOF" cat > "${ezjail_rootdir}/etc/rc.d/ezjail-config" <<"EOF"
#!/bin/sh #!/bin/sh
# #
# BEFORE: DAEMON # BEFORE: DAEMON
# PROVIDES: ezjail-config # PROVIDE: ezjail-config
# #
case "$1" in case "$1" in
*start) *start)
@ -694,6 +693,7 @@ case "$1" in
esac esac
EOF EOF
chmod 0755 "${ezjail_rootdir}/etc/rc.d/ezjail-config" chmod 0755 "${ezjail_rootdir}/etc/rc.d/ezjail-config"
fi
done done
fi fi