create a flag file in /mnt/live if network is set up by initrd,
make dhclient.service in slax check for this file and skip network reconfig if existspull/40/head
parent
ce19462ccd
commit
be70b4cc80
|
|
@ -4,10 +4,11 @@ Documentation=man:dhclient(8)
|
|||
Wants=network.target
|
||||
After=network-pre.target systemd-sysctl.service systemd-modules-load.service
|
||||
Before=network.target shutdown.target network-online.target
|
||||
ConditionPathExists=/mnt/live/net.up.flag
|
||||
|
||||
[Service]
|
||||
Type=forking
|
||||
ExecStart=-/bin/sh -c 'udevadm settle && cat /proc/cmdline | egrep -qvi " ip=| from=http" && dhclient -nw'
|
||||
ExecStart=-/bin/sh -c 'udevadm settle && dhclient -nw'
|
||||
PIDFile=/run/dhclient.pid
|
||||
|
||||
[Install]
|
||||
|
|
|
|||
|
|
@ -739,9 +739,10 @@ change_root()
|
|||
{
|
||||
debug_log "change_root" "$*"
|
||||
|
||||
# if we are booting over httpfs, we need to copyup these files so they are
|
||||
# if we are booting over httpfs, we need to copyup some files so they are
|
||||
# accessible on union without any further lookup down, else httpfs locks
|
||||
if [ "$(network_device)" != "" ]; then
|
||||
touch "/net.up.flag"
|
||||
touch "$1/etc/resolv.conf"
|
||||
touch "$1/etc/hosts"
|
||||
touch "$1/etc/gai.conf"
|
||||
|
|
|
|||
Loading…
Reference in New Issue