sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

change rc defaults reading

Browse source 
. always install them (overwrite)
	. source minix one from /etc/defaults/rc.conf
	  so that it'll get read on existing installs
	  without overwriting rc.conf (doesn't happen by default
	  as it's user-editable), needed for new netconf system
	. reported by Tenkawa
This commit is contained in:
Ben Gras 2011-11-23 15:01:00 +00:00
parent 79853dc9bc
commit 1062293981
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
etc/Makefile
View file

@ -10,7 +10,7 @@ FILES1=group hostname.file inet.conf motd.install mtab profile \
PWFILES=master.passwd PWFILES=master.passwd
FILES3=daily dhcptags.conf rc FILES3=daily dhcptags.conf rc
DEFAULTFILES=minix.rc.conf DEFAULTFILES=rc.conf minix.rc.conf
USRFILES=Makefile USRFILES=Makefile
TOOL_PWD_MKDB= pwd_mkdb TOOL_PWD_MKDB= pwd_mkdb
@ -25,7 +25,7 @@ install:: installpw # installpw needed to bootstrap pw db
@echo "Making hierarchy.." @echo "Making hierarchy.."
sh mtree.sh mtree/minix.tree sh mtree.sh mtree/minix.tree
@for f in $(FILES3); do if [ -f $(USRETC)/$$f ]; then :; else cp usr/$$f $(USRETC); chmod 755 $(USRETC)/$$f; fi; done @for f in $(FILES3); do if [ -f $(USRETC)/$$f ]; then :; else cp usr/$$f $(USRETC); chmod 755 $(USRETC)/$$f; fi; done
for f in $(DEFAULTFILES); do cp $$f $(DEFAULTS); chmod 644 $(DEFAULTS)/$$f; done for f in $(DEFAULTFILES); do cp defaults/$$f $(DEFAULTS)/; chmod 644 $(DEFAULTS)/$$f; done
@echo "Making devices.." @echo "Making devices.."
p=`pwd` && cd /dev && sh $$p/../commands/MAKEDEV/MAKEDEV.sh null p=`pwd` && cd /dev && sh $$p/../commands/MAKEDEV/MAKEDEV.sh null
p=`pwd` && cd /dev && sh $$p/../commands/MAKEDEV/MAKEDEV.sh std 2>/dev/null p=`pwd` && cd /dev && sh $$p/../commands/MAKEDEV/MAKEDEV.sh std 2>/dev/null

0
etc/minix.rc.conf → etc/defaults/minix.rc.conf
View file

4
etc/defaults/rc.conf Normal file
View file

@ -0,0 +1,4 @@
if [ -r /etc/defaults/minix.rc.conf ]; then
. /etc/defaults/minix.rc.conf
fi

4
etc/rc.conf
View file

@ -13,10 +13,6 @@ if [ -r /etc/defaults/rc.conf ]; then
. /etc/defaults/rc.conf . /etc/defaults/rc.conf
fi fi
if [ -r /etc/defaults/minix.rc.conf ]; then
. /etc/defaults/minix.rc.conf
fi
# If this is not set to YES, the system will drop into single-user mode. # If this is not set to YES, the system will drop into single-user mode.
# (Doesn't matter for Minix.) # (Doesn't matter for Minix.)
rc_configured=NO rc_configured=NO