![[BACK]](/icons/back.gif){kind=icon}
Up to [local] / src / distrib / miniroot
Request diff between arbitrary revisions
Default branch: MAIN
Revision 1.51 / (download) - annotate - [select for diffs], Mon Feb 20 01:55:41 2023 UTC (15 months, 2 weeks ago) by kn
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE,
OPENBSD_7_5,
OPENBSD_7_4_BASE,
OPENBSD_7_4,
OPENBSD_7_3_BASE,
OPENBSD_7_3,
HEAD
Changes since 1.50: +4 -1 lines
Diff to previous 1.50 (colored)
Disable strict bourne shell mode to get ksh behaviour in (S)hell Enable features like arithmatic expression and thus make the debug aid `FUNCS_ONLY=1 . /install.sub' work in those prompts. '!' answers spawn their own ksh process, but (S)hell drops into /.profile sourced by /bin/sh executed by init(8), i.e. a korn shell defaulting to strict bourne shell mode. Shell options in this interactive parent shell do not effect install.sub aka. /install, /autoinstall and /upgrade as it is executed in a child. OK afresh1
Revision 1.50 / (download) - annotate - [select for diffs], Mon May 9 22:42:53 2022 UTC (2 years, 1 month ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_7_2_BASE,
OPENBSD_7_2
Changes since 1.49: +13 -8 lines
Diff to previous 1.49 (colored)
In a couple places, use set -m to cause subshells to gain process groups, and then kill the process group instead of the ksh pid. Some of these processes contain sleep, which kept running, and in some cases retained stderr (or other fd) and confused parent processes. In some cases, add manual wait. Finally, store the pid (nee pgrp) in /tmp/xxpid files rather than variables, since there is a bit of recursion and sub-shell confusion happening, and we have confused ourselves at least twice with these pid variables not being in scope. ok beck, with florian, ok kn In snaps for almost a week. A few more tweaks may come in a while.
Revision 1.49 / (download) - annotate - [select for diffs], Wed Sep 8 13:16:53 2021 UTC (2 years, 9 months ago) by kn
Branch: MAIN
CVS Tags: OPENBSD_7_1_BASE,
OPENBSD_7_1,
OPENBSD_7_0_BASE,
OPENBSD_7_0
Changes since 1.48: +7 -12 lines
Diff to previous 1.48 (colored)
Backout "Merge sysupgrade watchdog and prompt timeout code" (commitid 0SH0ijktpPPcSctj) "/autoinstall[2697]: start_timeout: not found" during non-interactive upgrade, e.g. sysupgrade(8). Reported by Joel Carnat <joel at carnat dot net>, thanks.
Revision 1.48 / (download) - annotate - [select for diffs], Sun Aug 29 13:31:52 2021 UTC (2 years, 9 months ago) by kn
Branch: MAIN
Changes since 1.47: +13 -8 lines
Diff to previous 1.47 (colored)
Merge sysupgrade watchdog and prompt timeout code
Provide TIMOUT_{ACTION,PERIOD_SEC} in {start,stop,reset}_timeout() to have
install.sub and dot.profile use the same mnemonic helpers.
Revision 1.47 / (download) - annotate - [select for diffs], Sun Aug 29 13:16:22 2021 UTC (2 years, 9 months ago) by kn
Branch: MAIN
Changes since 1.46: +24 -14 lines
Diff to previous 1.46 (colored)
Sync prompt timeout code with sysupgrade watchdog Simplify code and employ the same technique in both places. The "prompt timeout" hits when on non-interactive installations or upgrades: Welcome to the OpenBSD/amd64 6.9 installation program. Starting non-interactive mode in 5 seconds... (I)nstall, (U)pgrade, (A)utoinstall or (S)hell? Performing non-interactive upgrade... The existing code uses a regular background job and does quirky file descriptor fiddling just to avoid job control messages when starting the timeout in the background. It also does `set +m' a second time for no reason and hardodes the number of seconds in multiple places. Do better by using a co-process just like sysupgrade's watchdog that reboots when the upgrade did not finish in time. reads good to aja
Revision 1.46 / (download) - annotate - [select for diffs], Wed Jul 21 03:53:50 2021 UTC (2 years, 10 months ago) by kn
Branch: MAIN
Changes since 1.45: +5 -4 lines
Diff to previous 1.45 (colored)
Use exclusive lock under /dev/, silence expected errors in installer resolvd(8), slaacd(8) and dhcpleased(8) are different from other daemons in that there must only be a single instance. resolvd already does this, adjust slaacd and dhcpleased accordingly while moving the lockfile paths under /dev/ such that they work early on boot and don't run into races should /var be (un)mounted between daemon starts. Locking is especially required in the installer where all three daemons are started every time the "(I)nstall, (U)pgrade, (A)utoinstall or (S)hell? " prompt is entered, i.e. restarting installation or dropping into a shell and back into the prompt again would start multiple instances. To avoid expected lockfile error messages in between installer prompts, discard standard error when starting the autoconf daemons; none of them has other potential failure cases in installer mode before daemon(3)izing. Input sthen deraadt OK deraadt
Revision 1.45 / (download) - annotate - [select for diffs], Fri Jul 16 15:24:44 2021 UTC (2 years, 10 months ago) by florian
Branch: MAIN
Changes since 1.44: +7 -6 lines
Diff to previous 1.44 (colored)
Create working directories earlier so that resolvd can write resolv.conf.shadow and start dhcpleased/resolvd. OK deraadt
Revision 1.44 / (download) - annotate - [select for diffs], Sat Apr 27 22:08:58 2019 UTC (5 years, 1 month ago) by kn
Branch: MAIN
CVS Tags: OPENBSD_6_9_BASE,
OPENBSD_6_9,
OPENBSD_6_8_BASE,
OPENBSD_6_8,
OPENBSD_6_7_BASE,
OPENBSD_6_7,
OPENBSD_6_6_BASE,
OPENBSD_6_6
Changes since 1.43: +2 -2 lines
Diff to previous 1.43 (colored)
It's timer_pid not timeout_pid There since introduction in 1.18 (2013). OK halex
Revision 1.43 / (download) - annotate - [select for diffs], Wed Apr 24 15:59:22 2019 UTC (5 years, 1 month ago) by florian
Branch: MAIN
Changes since 1.42: +4 -1 lines
Diff to previous 1.42 (colored)
Perform unattended upgrade if /bsd.upgrade is present. Sets are expected to be in /home/upgrade. Original idea, input & OK deraadt
Revision 1.42 / (download) - annotate - [select for diffs], Fri Oct 13 18:06:28 2017 UTC (6 years, 7 months ago) by rpe
Branch: MAIN
CVS Tags: OPENBSD_6_5_BASE,
OPENBSD_6_5,
OPENBSD_6_4_BASE,
OPENBSD_6_4,
OPENBSD_6_3_BASE,
OPENBSD_6_3
Changes since 1.41: +3 -3 lines
Diff to previous 1.41 (colored)
Move extraction of rootdisk information into the DONEPROFILE if-block. OK tb@
Revision 1.41 / (download) - annotate - [select for diffs], Fri Oct 13 17:31:26 2017 UTC (6 years, 7 months ago) by rpe
Branch: MAIN
Changes since 1.40: +3 -1 lines
Diff to previous 1.40 (colored)
Comment trap handlers
Revision 1.40 / (download) - annotate - [select for diffs], Fri Oct 13 17:23:01 2017 UTC (6 years, 7 months ago) by rpe
Branch: MAIN
Changes since 1.39: +9 -8 lines
Diff to previous 1.39 (colored)
Tweak comments
Revision 1.39 / (download) - annotate - [select for diffs], Fri Oct 13 17:13:40 2017 UTC (6 years, 7 months ago) by rpe
Branch: MAIN
Changes since 1.38: +3 -4 lines
Diff to previous 1.38 (colored)
Add a comment for slaacd(8) start and replace the if-then-fi block with a [[ test ]] && command construct.
Revision 1.38 / (download) - annotate - [select for diffs], Sat Jul 8 15:45:11 2017 UTC (6 years, 11 months ago) by florian
Branch: MAIN
CVS Tags: OPENBSD_6_2_BASE,
OPENBSD_6_2
Changes since 1.37: +5 -1 lines
Diff to previous 1.37 (colored)
Enable slaacd on the installer and temporarily neuter router advertisement processing and solicitation sending like we already did for the non-install kernels. Next step will be to tedu all that code from the kernel. OK rpe@ for the installer bits move forward deraadt@
Revision 1.37 / (download) - annotate - [select for diffs], Mon Feb 20 21:27:36 2017 UTC (7 years, 3 months ago) by rpe
Branch: MAIN
CVS Tags: OPENBSD_6_1_BASE,
OPENBSD_6_1
Changes since 1.36: +2 -3 lines
Diff to previous 1.36 (colored)
Zap the extra echo and show the prompt using the var?'prompt' feature of read.
Revision 1.36 / (download) - annotate - [select for diffs], Fri Sep 9 14:52:28 2016 UTC (7 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.35: +5 -14 lines
Diff to previous 1.35 (colored)
There were 3 ways of using shell at the initial prompt of the installer. One is enough. OK halex
Revision 1.35 / (download) - annotate - [select for diffs], Mon Sep 5 10:19:46 2016 UTC (7 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.34: +8 -8 lines
Diff to previous 1.34 (colored)
Tweak comments and spacing. OK krw, halex
Revision 1.34 / (download) - annotate - [select for diffs], Mon Sep 5 09:15:05 2016 UTC (7 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.33: +2 -2 lines
Diff to previous 1.33 (colored)
Relax permissions to make files readable by unpriv users again. Found out by naddy OK deraadt
Revision 1.33 / (download) - annotate - [select for diffs], Sun Sep 4 09:56:46 2016 UTC (7 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.32: +6 -3 lines
Diff to previous 1.32 (colored)
Move files created by root during install/upgrade in a subdir of /tmp with proper permissions so that unprivileged programs can not tamper with them. positive feedback from deraadt OK halex
Revision 1.32 / (download) - annotate - [select for diffs], Fri Apr 8 17:09:18 2016 UTC (8 years, 2 months ago) by rpe
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE,
OPENBSD_6_0
Changes since 1.31: +2 -3 lines
Diff to previous 1.31 (colored)
Directly assign device name to rootdisk with modified sed pattern. With help from and OK halex@ OK krw@
Revision 1.31 / (download) - annotate - [select for diffs], Sat Apr 2 12:23:46 2016 UTC (8 years, 2 months ago) by rpe
Branch: MAIN
Changes since 1.30: +2 -2 lines
Diff to previous 1.30 (colored)
- merge install.sh into install.sub as do_install()
- merge upgrade.sh into install.sub as do_upgrade()
- delete install.sh and upgrade.sh
- make install.sub executable
- turn install and upgrade into symbolic links to install.sub
- add autoinstall symbolic link to install.sub
- change dot.profile to use these symlinks
- introduce a -m option to set MODE in install.sub
- alternativly set MODE and AUTO depending on PROGNAME
- execute the do_{install,upgrade) functions depending on $MODE
OK halex@, krw@
'go for it' deraadt@
Revision 1.30 / (download) - annotate - [select for diffs], Tue Jan 26 22:26:54 2016 UTC (8 years, 4 months ago) by rpe
Branch: MAIN
CVS Tags: OPENBSD_5_9_BASE,
OPENBSD_5_9
Changes since 1.29: +2 -2 lines
Diff to previous 1.29 (colored)
spacing OK krw@
Revision 1.29 / (download) - annotate - [select for diffs], Fri Jul 3 18:29:08 2015 UTC (8 years, 11 months ago) by rpe
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE,
OPENBSD_5_8
Changes since 1.28: +5 -5 lines
Diff to previous 1.28 (colored)
Use [aA]* instead of a*|A* in case-blocks. OK krw@ @halex agreed on this in a similar diff
Revision 1.28 / (download) - annotate - [select for diffs], Wed Jul 1 21:12:49 2015 UTC (8 years, 11 months ago) by rpe
Branch: MAIN
Changes since 1.27: +6 -6 lines
Diff to previous 1.27 (colored)
Use ksh style tests like in the rest of the installer scripts. OK krw@ halex@
Revision 1.27 / (download) - annotate - [select for diffs], Sat Mar 28 00:03:05 2015 UTC (9 years, 2 months ago) by rpe
Branch: MAIN
Changes since 1.26: +4 -4 lines
Diff to previous 1.26 (colored)
- Start comments with capital letters. - End comments with a full stop. OK krw@
Revision 1.26 / (download) - annotate - [select for diffs], Thu Oct 23 21:33:21 2014 UTC (9 years, 7 months ago) by rpe
Branch: MAIN
CVS Tags: OPENBSD_5_7_BASE,
OPENBSD_5_7
Changes since 1.25: +4 -2 lines
Diff to previous 1.25 (colored)
Extend autoinstall(8) feature: - Ask for responsefile location (url or local path) if dhcp discovery fails for location or mode. If 'next-server' is found in dhcp lease file, provide a default url http://next-server/install.conf. - Ask for installer mode if the specified response file name does not match *install.conf or *upgrade.conf. - If present, use /auto_install.conf or /auto_upgrade.conf as response file for unattended installation or upgrade. - Automatically start installer in unattended mode if either one of these files is present when the system boots. - Document changes in manpage and installation notes. OK krw@ deraadt@
Revision 1.25 / (download) - annotate - [select for diffs], Wed Jul 16 14:19:05 2014 UTC (9 years, 10 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE,
OPENBSD_5_6
Changes since 1.24: +2 -2 lines
Diff to previous 1.24 (colored)
spaces
Revision 1.24 / (download) - annotate - [select for diffs], Fri Feb 21 16:30:14 2014 UTC (10 years, 3 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_5_BASE,
OPENBSD_5_5
Changes since 1.23: +2 -1 lines
Diff to previous 1.23 (colored)
oops, seperate pieces coming...
Revision 1.23 / (download) - annotate - [select for diffs], Fri Feb 21 16:29:08 2014 UTC (10 years, 3 months ago) by deraadt
Branch: MAIN
Changes since 1.22: +2 -3 lines
Diff to previous 1.22 (colored)
services
Revision 1.22 / (download) - annotate - [select for diffs], Mon Dec 16 16:58:22 2013 UTC (10 years, 5 months ago) by halex
Branch: MAIN
Changes since 1.21: +2 -2 lines
Diff to previous 1.21 (colored)
Replace `[RESPONSEFILE=...] install auto` voodoo with plain'ol getopts, as discussed with uwe@ at some point. ok krw@, rpe@, "Cool" uwe@
Revision 1.21 / (download) - annotate - [select for diffs], Mon Dec 2 20:55:11 2013 UTC (10 years, 6 months ago) by halex
Branch: MAIN
Changes since 1.20: +2 -2 lines
Diff to previous 1.20 (colored)
As the number of interactively triggered (A)utoinstall's should be quite outnumbered by (I)nstall's and (U)pgrade's, reorder the alternatives. "sure" deraadt@
Revision 1.20 / (download) - annotate - [select for diffs], Thu Nov 28 00:09:21 2013 UTC (10 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.19: +2 -2 lines
Diff to previous 1.19 (colored)
Now, that the auto installer supports both, install and upgrade, use "non-interactive mode" instead of installation. ok deraadt@
Revision 1.19 / (download) - annotate - [select for diffs], Thu Nov 14 15:20:54 2013 UTC (10 years, 6 months ago) by halex
Branch: MAIN
Changes since 1.18: +3 -2 lines
Diff to previous 1.18 (colored)
fix ^C handling which was accidentally trapped a bit to much ok rpe@ krw@
Revision 1.18 / (download) - annotate - [select for diffs], Sun Oct 27 22:36:06 2013 UTC (10 years, 7 months ago) by uwe
Branch: MAIN
Changes since 1.17: +41 -2 lines
Diff to previous 1.17 (colored)
Unattended installation using DHCP and a response file For a completely unattended installation bsd.rd has to be netbooted, a DHCP server must be running and provide "next-server", which will be used to fetch "http://<next-server>/install.conf". The format of the response file is a list of "<key> = <value>" pairs where <key> is a substring of the interactive question (case-insensitive) and <value> is what would be entered interactively. Minimal response file example: system hostname = openbsd password for root account = <...> network interfaces = re0 IPv4 address for re0 = dhcp server? = <...> This is a starting point, it still a bit rough. ok krw@, many improvements by halex@
Revision 1.17 / (download) - annotate - [select for diffs], Fri Jul 8 23:53:53 2011 UTC (12 years, 11 months ago) by halex
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE,
OPENBSD_5_4,
OPENBSD_5_3_BASE,
OPENBSD_5_3,
OPENBSD_5_2_BASE,
OPENBSD_5_2,
OPENBSD_5_1_BASE,
OPENBSD_5_1,
OPENBSD_5_0_BASE,
OPENBSD_5_0
Changes since 1.16: +4 -1 lines
Diff to previous 1.16 (colored)
make exiting the shell take you back to the inital prompt "i like" henning@, "Fine with me" deraadt@
Revision 1.16 / (download) - annotate - [select for diffs], Wed Jun 30 20:22:01 2010 UTC (13 years, 11 months ago) by halex
Branch: MAIN
CVS Tags: OPENBSD_4_9_BASE,
OPENBSD_4_9,
OPENBSD_4_8_BASE,
OPENBSD_4_8
Changes since 1.15: +2 -1 lines
Diff to previous 1.15 (colored)
revert last ^D behaviour change requested and well explained by krw@
Revision 1.15 / (download) - annotate - [select for diffs], Wed Jun 30 19:31:19 2010 UTC (13 years, 11 months ago) by halex
Branch: MAIN
Changes since 1.14: +2 -3 lines
Diff to previous 1.14 (colored)
make the installer quit when ^D is pressed at any prompt ok deraadt@
Revision 1.14 / (download) - annotate - [select for diffs], Sun Jan 10 13:32:56 2010 UTC (14 years, 5 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_4_7_BASE,
OPENBSD_4_7
Changes since 1.13: +3 -11 lines
Diff to previous 1.13 (colored)
remove and move some chatty byte during upgrade startup; ok krw, idea from mcbride
Revision 1.13 / (download) - annotate - [select for diffs], Fri Jun 12 03:30:00 2009 UTC (15 years ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_4_6_BASE,
OPENBSD_4_6
Changes since 1.12: +29 -25 lines
Diff to previous 1.12 (colored)
Put back the once-only code that krw removed earlier, because we want ^C from the install script to go to the # prompt, not back to the question.
Revision 1.12 / (download) - annotate - [select for diffs], Sun Jun 7 03:52:29 2009 UTC (15 years ago) by krw
Branch: MAIN
Changes since 1.11: +2 -12 lines
Diff to previous 1.11 (colored)
More tersification. Fixes verbiage issue reported by jdixon@ on icb.
Revision 1.11 / (download) - annotate - [select for diffs], Thu Jun 4 06:41:53 2009 UTC (15 years ago) by krw
Branch: MAIN
Changes since 1.10: +6 -1 lines
Diff to previous 1.10 (colored)
Implement '!' and '!<cmd>' at the "(I)nstall ..." prompt so we aren't lying about being able to do that at any prompt. Suggested by deraadt@
Revision 1.10 / (download) - annotate - [select for diffs], Thu Jun 4 06:23:53 2009 UTC (15 years ago) by krw
Branch: MAIN
Changes since 1.9: +4 -5 lines
Diff to previous 1.9 (colored)
Only print the intro verbiage once, instead of every pass through the "(I)nstall, ..." loop. Noticed by & ok deraadt@
Revision 1.9 / (download) - annotate - [select for diffs], Wed Jun 3 23:44:53 2009 UTC (15 years ago) by krw
Branch: MAIN
Changes since 1.8: +50 -29 lines
Diff to previous 1.8 (colored)
Add hw.machine and kern.osrelease to install media sysctl. Using these rather than hard coded variables allows the rationalization of the greeting by moving it into dot.profile. Whack at dot.profile a lot. Eliminate the 'Proceed with ...' question as unneeded. Eliminate welcome(). ok deraadt@ "I like" todd@
Revision 1.8 / (download) - annotate - [select for diffs], Sun Aug 3 14:18:00 2008 UTC (15 years, 10 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_4_5_BASE,
OPENBSD_4_5,
OPENBSD_4_4_BASE,
OPENBSD_4_4
Changes since 1.7: +5 -3 lines
Diff to previous 1.7 (colored)
Sparc miniroot hasn't worked for a while, since the sed code to find the root disk was broken. Simplify and fix said sed code. Problem noted by okan@ and others, diagnosed by deraadt@, sed suggestions from nordin@, jmc@, fgsch@, guenther@. 'get something in before sparc gets done' deraadt@
Revision 1.7 / (download) - annotate - [select for diffs], Fri Nov 16 21:18:35 2007 UTC (16 years, 6 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_4_3_BASE,
OPENBSD_4_3
Changes since 1.6: +2 -8 lines
Diff to previous 1.6 (colored)
Simplify the sed expression used to set 'rootdisk'. Shaves bytes from the install media. From Tamas Tevesz.
Revision 1.6 / (download) - annotate - [select for diffs], Fri Feb 16 04:48:48 2007 UTC (17 years, 3 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_4_2_BASE,
OPENBSD_4_2,
OPENBSD_4_1_BASE,
OPENBSD_4_1
Changes since 1.5: +2 -2 lines
Diff to previous 1.5 (colored)
better X"" idiom in while loop; didickman@yahoo.com
Revision 1.5 / (download) - annotate - [select for diffs], Sat Mar 4 20:11:12 2006 UTC (18 years, 3 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_4_0_BASE,
OPENBSD_4_0
Changes since 1.4: +3 -2 lines
Diff to previous 1.4 (colored)
Put comment on separate line so it is stripped from install media.
Revision 1.4 / (download) - annotate - [select for diffs], Fri Sep 13 21:38:47 2002 UTC (21 years, 9 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_3_9_BASE,
OPENBSD_3_9,
OPENBSD_3_8_BASE,
OPENBSD_3_8,
OPENBSD_3_7_BASE,
OPENBSD_3_7,
OPENBSD_3_6_BASE,
OPENBSD_3_6,
OPENBSD_3_5_BASE,
OPENBSD_3_5,
OPENBSD_3_4_BASE,
OPENBSD_3_4,
OPENBSD_3_3_BASE,
OPENBSD_3_3,
OPENBSD_3_2_BASE,
OPENBSD_3_2
Changes since 1.3: +2 -2 lines
Diff to previous 1.3 (colored)
do not stty 9600
Revision 1.3 / (download) - annotate - [select for diffs], Thu Aug 29 01:53:37 2002 UTC (21 years, 9 months ago) by krw
Branch: MAIN
Changes since 1.2: +4 -2 lines
Diff to previous 1.2 (colored)
Add a new verb to list2sh.awk, 'REMOVE'. This allows the easy disabling of '(U)pgrade' in architectures by adding REMOVE upgrade to the end of the 'list' file for that architecture. Add code to dot.profile to check for the presence of the upgrade script before offering to (U)pgrade. Use the new verb to disable upgrades for sparc. ok deraadt@.
Revision 1.2 / (download) - annotate - [select for diffs], Sun Jun 9 05:53:54 2002 UTC (22 years ago) by todd
Branch: MAIN
Changes since 1.1: +2 -2 lines
Diff to previous 1.1 (colored)
knf
Revision 1.1 / (download) - annotate - [select for diffs], Mon Apr 22 02:43:16 2002 UTC (22 years, 1 month ago) by deraadt
Branch: MAIN
use one common dot.profile for all