##// END OF EJS Templates
Restart systemd.resolv only if not resolv.conf exists
root -
r101:cab8c29a873b
parent child
Show More
@@ -71,6 +71,10 if [ "$BUILD_KERNEL" = true ] ; then
71 # Load default raspberry kernel configuration
71 # Load default raspberry kernel configuration
72 make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" "${KERNEL_DEFCONFIG}"
72 make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" "${KERNEL_DEFCONFIG}"
73
73
74 if [ ! -z "$KERNELUSR_CONFIG" ] ; then
75 cp $KERNELUSR_CONFIG ${KERNEL_DIR}/.config
76 fi
77
74 # Start menu-driven kernel configuration (interactive)
78 # Start menu-driven kernel configuration (interactive)
75 if [ "$KERNEL_MENUCONFIG" = true ] ; then
79 if [ "$KERNEL_MENUCONFIG" = true ] ; then
76 make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" menuconfig
80 make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" menuconfig
@@ -11,4 +11,13
11 #
11 #
12 # By default this script does nothing.
12 # By default this script does nothing.
13
13
14 if [ ! -e /var/cfengine/policy_server.dat ] ; then
15 while ! ping -c 1 -q zcu.cz; do sleep 2s; done
16 rm -f /var/cfengine/ppkeys/*
17 /var/cfengine/bin/cf-key
18 /var/cfengine/bin/cf-agent --bootstrap cf.civ.zcu.cz
19 /var/cfengine/bin/cf-agent -Kf update.cf -D FORCE_update
20 /var/cfengine/bin/cf-agent -Kf update.cf -D FORCE_update
21 fi
22
14 exit 0
23 exit 0
@@ -1,7 +1,7
1 logger -t "rc.firstboot" "Creating /etc/resolv.conf symlink"
1 logger -t "rc.firstboot" "Creating /etc/resolv.conf symlink"
2
2
3 # Check if systemd resolve directory exists
3 # Check if systemd resolve directory exists
4 if [ ! -d "/run/systemd/resolve" ] ; then
4 if [ ! -d "/run/systemd/resolve" -a ! -e "/etc/resolv.conf" ] ; then
5 systemctl enable systemd-resolved.service
5 systemctl enable systemd-resolved.service
6 systemctl restart systemd-resolved.service
6 systemctl restart systemd-resolved.service
7 fi
7 fi
@@ -11,5 +11,8 if [ ! -f "/run/systemd/resolve/resolv.conf" ] ; then
11 touch /run/systemd/resolve/resolv.conf
11 touch /run/systemd/resolve/resolv.conf
12 fi
12 fi
13
13
14 # Create symlink to /etc/reolv.conf
14 # Create symlink to /etc/reolv.conf if not exists yet
15 ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf
15 if [ ! -e "/etc/resolv.conf" ] ; then
16 ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf
17 fi
18
General Comments 0
Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant