Hello community,
here is the log from the commit of package opensuse-dhcp-server-image for
openSUSE:Factory checked in at 2019-10-30 14:44:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/opensuse-dhcp-server-image (Old)
and /work/SRC/openSUSE:Factory/.opensuse-dhcp-server-image.new.2990 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opensuse-dhcp-server-image"
Wed Oct 30 14:44:29 2019 rev:2 rq:743808 version:1.0.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/opensuse-dhcp-server-image/opensuse-dhcp-server-image.changes
2019-10-24 23:09:11.788524551 +0200
+++
/work/SRC/openSUSE:Factory/.opensuse-dhcp-server-image.new.2990/opensuse-dhcp-server-image.changes
2019-10-30 14:44:29.817970393 +0100
@@ -1,0 +2,5 @@
+Tue Oct 29 09:13:41 CET 2019 - ku...@suse.de
+
+- Create default dhcpd.conf/dhcpd6.conf files if they don't exist
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ root.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/usr/local/bin/entrypoint.sh
new/usr/local/bin/entrypoint.sh
--- old/usr/local/bin/entrypoint.sh 2019-10-23 19:34:10.639877218 +0200
+++ new/usr/local/bin/entrypoint.sh 2019-10-29 10:12:02.495971913 +0100
@@ -16,7 +16,7 @@
# Run dhcpd for specified interface or all interfaces
if [ -z "${DHCPD_INTERFACES}" ]; then
- echo "Please ensure '$DHCPD_INTERFACES' contains at least one interface!"
+ echo "ERROR: Please ensure 'DHCPD_INTERFACES' contains at least one
interface!" 1>&2
exit 1
fi
@@ -26,22 +26,26 @@
DHCPD_DIR="/data"
if [ ! -d "$DHCPD_DIR" ]; then
- echo "Please ensure '$DHCPD_DIR' folder is available."
- echo 'If you just want to keep your configuration in "data/", add -v
"$(pwd)/data:/data" to the docker run command line.'
+ echo "ERROR: Please ensure '$DHCPD_DIR' folder is available." 1>&2
exit 1
fi
if [ ${DHCPD_IP_PROTOCOL} -eq 4 ]; then
dhcpd_conf="$DHCPD_DIR/dhcpd.conf"
dhcpd_leases="$DHCPD_DIR/dhcpd.leases"
+ if [ ! -e $dhcpd_conf ]; then
+ cp -av /etc/dhcpd.conf $DHCPD_DIR/
+ fi
else
dhcpd_conf="$DHCPD_DIR/dhcpd6.conf"
dhcpd_leases="$DHCPD_DIR/dhcpd6.leases"
+ if [ ! -e $dhcpd_conf ]; then
+ cp -av /etc/dhcpd6.conf $DHCPD_DIR/
+ fi
fi
-
if [ ! -r "$dhcpd_conf" ]; then
- echo "Please ensure '$dhcpd_conf' exists and is readable."
+ echo "ERROR Please ensure '$dhcpd_conf' exists and is readable." 1>&2
echo "Run the container with arguments 'man dhcpd.conf' if you need help
with creating the configuration."
exit 1
fi
