diff options
Diffstat (limited to '')
| -rwxr-xr-x | liveinit | 21 |
1 files changed, 20 insertions, 1 deletions
@@ -72,6 +72,8 @@ BLACKLIST="" GLAMORACCEL=1 # NFS root support: +HNMAC="" +HNMAC_ALLOWED="YES" INTERFACE="" NFSHOST="" @@ -116,7 +118,12 @@ for ARG in $(cat /proc/cmdline); do DHCPWAIT=$(echo $ARG | cut -f2 -d=) ;; hostname=*) - LIVE_HOSTNAME=$(echo $ARG | cut -f2 -d=) + # generic syntax: hostname=newname[,qualifier] + LIVE_HOSTNAME=$(echo $ARG | cut -f2 -d= | cut -f1 -d,) + if [ "$(echo $ARG | cut -f2 -d= | cut -f2 -d,)" = "fixed" ]; then + Keep hostname fixed i.e. never add a MAC address suffix: + HNMAC_ALLOWED="NO" + fi ;; init=*) INIT=$(echo $ARG | cut -f2 -d=) @@ -411,6 +418,9 @@ if [ "$RESCUE" = "" ]; then fi fi + # Store the interface MAC address so we may modify the hostname with it: + HNMAC=$(ip link show ${INTERFACE} |grep link/ether |tr -s ' ' |cut -d ' ' -f3 |tr -d ':') + } # End setnet() find_loop() { @@ -842,6 +852,15 @@ root:${ROOTPW} EOPW fi + if [ ! -z "$HNMAC" -a "$HNMAC_ALLOWED" = "YES" ]; then + # We are booting from the network, give it a unique hostname: + if [ -z "$LIVE_HOSTNAME" ]; then + LIVE_HOSTNAME="@DARKSTAR@-${HNMAC}" + else + LIVE_HOSTNAME="${LIVE_HOSTNAME}-${HNMAC}" + fi + fi + if [ ! -z "$LIVE_HOSTNAME" ]; then # User entered a custom hostname on the boot commandline: echo "${MARKER}: Changing hostname to '$LIVE_HOSTNAME'." |