File tree Expand file tree Collapse file tree 5 files changed +16
-2
lines changed Expand file tree Collapse file tree 5 files changed +16
-2
lines changed Original file line number Diff line number Diff line change @@ -19,6 +19,7 @@ dhcpcd.8
19
19
dhcpcd-run-hooks
20
20
dhcpcd-run-hooks.8
21
21
dhcpcd.conf.5
22
+ hooks /30-hostname
22
23
hooks /50-ypbind
23
24
24
25
# Ignore distribution
Original file line number Diff line number Diff line change @@ -32,3 +32,4 @@ SED_SERVICESTATUS= -e 's:@SERVICESTATUS@:${SERVICESTATUS}:g'
32
32
SED_STATUSARG = -e 's:@STATUSARG@:${STATUSARG}:g'
33
33
SED_SCRIPT = -e 's:@SCRIPT@:${SCRIPT}:g'
34
34
SED_SYS = -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g'
35
+ SED_DEFAULT_HOSTNAME = -e 's:@DEFAULT_HOSTNAME@:${DEFAULT_HOSTNAME}:g'
Original file line number Diff line number Diff line change @@ -87,6 +87,7 @@ for x do
87
87
PKG_CONFIG) PKG_CONFIG=$var ;;
88
88
--with-hook) HOOKSCRIPTS=" $HOOKSCRIPTS ${HOOKSCRIPTS: + } $var " ;;
89
89
--with-hooks|HOOKSCRIPTS) HOOKSCRIPTS=$var ; HOOKSET=true;;
90
+ --with-default-hostname) _DEFAULT_HOSTNAME=$var ;;
90
91
--build) BUILD=$var ;;
91
92
--host) HOST=$var ; HOSTCC=$var -;;
92
93
--target) TARGET=$var ;;
@@ -494,6 +495,16 @@ solaris*|sunos*)
494
495
;;
495
496
esac
496
497
498
+ if [ -n " ${_DEFAULT_HOSTNAME+x} " ]; then
499
+ DEFAULT_HOSTNAME=" ${_DEFAULT_HOSTNAME} "
500
+ else
501
+ case " $OS " in
502
+ * |linux* ) DEFAULT_HOSTNAME=" (none)" ;;
503
+ * ) DEFAULT_HOSTNAME=" " ;;
504
+ esac
505
+ fi
506
+ echo " DEFAULT_HOSTNAME= $DEFAULT_HOSTNAME " >> $CONFIG_MK
507
+
497
508
if [ -z " $INET " -o " $INET " = yes ]; then
498
509
echo " Enabling INET support"
499
510
echo " CPPFLAGS+= -DINET" >> $CONFIG_MK
Original file line number Diff line number Diff line change 17
17
18
18
# If we used to set the hostname, but relinquish control of it, we should
19
19
# reset to the default value.
20
- : ${hostname_default=}
20
+ : ${hostname_default=@DEFAULT_HOSTNAME@ }
21
21
22
22
# Some systems don't have hostname(1)
23
23
_hostname()
@@ -54,7 +54,7 @@ _hostname()
54
54
is_default_hostname()
55
55
{
56
56
case "$1" in
57
- ""|"(none) "|localhost|localhost.localdomain|"$hostname_default" )
57
+ ""|"$hostname_default "|localhost|localhost.localdomain)
58
58
return 0;;
59
59
esac
60
60
return 1
Original file line number Diff line number Diff line change @@ -27,6 +27,7 @@ FILES+= ${EGHOOKSCRIPTS}
27
27
${SED_SYS} ${SED_SCRIPT} ${SED_DATADIR} \
28
28
${SED_SERVICEEXISTS} ${SED_SERVICECMD} ${SED_SERVICESTATUS} \
29
29
${SED_STATUSARG} \
30
+ ${SED_DEFAULT_HOSTNAME} \
30
31
-e ' s:@YPDOMAIN_DIR@:${YPDOMAIN_DIR}:g' \
31
32
-e ' s:@YPDOMAIN_SUFFIX@:${YPDOMAIN_SUFFIX}:g' \
32
33
$< > $@
You can’t perform that action at this time.
0 commit comments