From a97854e089776f5b1100bba13079bb1ec13843ed Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Tue, 12 Sep 2017 16:04:18 +1000 Subject: [PATCH 1/3] add a debug dump of the dhcp server Signed-off-by: Sven Dowideit --- images/01-base/Dockerfile | 1 + images/01-base/dhcpcd.enter-hook | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 images/01-base/dhcpcd.enter-hook diff --git a/images/01-base/Dockerfile b/images/01-base/Dockerfile index ed9a3f6e..174b22bf 100644 --- a/images/01-base/Dockerfile +++ b/images/01-base/Dockerfile @@ -34,6 +34,7 @@ RUN rm /sbin/poweroff /sbin/reboot /sbin/halt && \ COPY inputrc /etc/inputrc COPY growpart /usr/bin/growpart COPY start_ntp.sh /bin/start_ntp.sh +COPY dhcpcd.enter-hook /etc/dhcpcd.enter-hook RUN sed -i s/"partx --update \"\$part\" \"\$dev\""/"partx --update --nr \"\$part\" \"\$dev\""/g /usr/bin/growpart && \ sed -i -e 's/duid/clientid/g' /etc/dhcpcd.conf && \ sed -i 1,10d /etc/rsyslog.conf && \ diff --git a/images/01-base/dhcpcd.enter-hook b/images/01-base/dhcpcd.enter-hook new file mode 100644 index 00000000..2f1fd22c --- /dev/null +++ b/images/01-base/dhcpcd.enter-hook @@ -0,0 +1,6 @@ +#!/bin/bash + +echo "DHCPCD: $interface $reason" &>> /var/log/dhcpcd.debug.log +echo "$(date)" &>> /var/log/dhcpcd.debug.log +set | sed -ne 's/^new_//p' | sort &>> /var/log/dhcpcd.debug.log +echo "--------------------------" &>> /var/log/dhcpcd.debug.log From ab9f22a9546adb3baf1eb702e19ebc542c36eefb Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Tue, 12 Sep 2017 20:56:19 +1000 Subject: [PATCH 2/3] make DHCP even debug print conditional on rancher.debug=true Signed-off-by: Sven Dowideit --- images/01-base/dhcpcd.enter-hook | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/images/01-base/dhcpcd.enter-hook b/images/01-base/dhcpcd.enter-hook index 2f1fd22c..c33f1500 100644 --- a/images/01-base/dhcpcd.enter-hook +++ b/images/01-base/dhcpcd.enter-hook @@ -1,6 +1,8 @@ #!/bin/bash -echo "DHCPCD: $interface $reason" &>> /var/log/dhcpcd.debug.log -echo "$(date)" &>> /var/log/dhcpcd.debug.log -set | sed -ne 's/^new_//p' | sort &>> /var/log/dhcpcd.debug.log -echo "--------------------------" &>> /var/log/dhcpcd.debug.log +if [ "$(ros config get rancher.debug)" == "true" ]; then + echo "DHCPCD: $interface $reason" &>> /var/log/dhcpcd.debug.log + echo "$(date)" &>> /var/log/dhcpcd.debug.log + set | sed -ne 's/^new_//p' | sort &>> /var/log/dhcpcd.debug.log + echo "--------------------------" &>> /var/log/dhcpcd.debug.log +fi From 42ae262c3f078de36aee91123158529c3679e93f Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Tue, 12 Sep 2017 21:07:43 +1000 Subject: [PATCH 3/3] add alog rotate for the dhcpcd.debug.log file Signed-off-by: Sven Dowideit --- images/01-base/Dockerfile | 1 + images/01-base/dhcpcd.debug | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 images/01-base/dhcpcd.debug diff --git a/images/01-base/Dockerfile b/images/01-base/Dockerfile index 174b22bf..7b06bf28 100644 --- a/images/01-base/Dockerfile +++ b/images/01-base/Dockerfile @@ -35,6 +35,7 @@ COPY inputrc /etc/inputrc COPY growpart /usr/bin/growpart COPY start_ntp.sh /bin/start_ntp.sh COPY dhcpcd.enter-hook /etc/dhcpcd.enter-hook +COPY dhcpcd.debug /usr/share/logrotate/logrotate.d/ RUN sed -i s/"partx --update \"\$part\" \"\$dev\""/"partx --update --nr \"\$part\" \"\$dev\""/g /usr/bin/growpart && \ sed -i -e 's/duid/clientid/g' /etc/dhcpcd.conf && \ sed -i 1,10d /etc/rsyslog.conf && \ diff --git a/images/01-base/dhcpcd.debug b/images/01-base/dhcpcd.debug new file mode 100644 index 00000000..47513bd6 --- /dev/null +++ b/images/01-base/dhcpcd.debug @@ -0,0 +1,7 @@ +/var/log/dhcpcd.debug.log +{ + rotate 7 + daily + missingok + copytruncate +}