Author: nwhitehorn
Date: Wed Mar 13 13:41:28 2013
New Revision: 248237
URL: http://svnweb.freebsd.org/changeset/base/248237
Log:
MFC miscellaneous bug fixes (r228042,228192,230522,232531,233473,233904,
235228,239500,241902,242188,243832,243854,244858,245333). This is mostly
documentation fixes and updates to the default FTP list that got left
behind in -CURRENT.
Modified:
stable/9/usr.sbin/bsdinstall/bsdinstall
stable/9/usr.sbin/bsdinstall/bsdinstall.8
stable/9/usr.sbin/bsdinstall/partedit/gpart_ops.c
stable/9/usr.sbin/bsdinstall/partedit/partedit.c
stable/9/usr.sbin/bsdinstall/partedit/partedit_powerpc.c
stable/9/usr.sbin/bsdinstall/scripts/auto
stable/9/usr.sbin/bsdinstall/scripts/mirrorselect
stable/9/usr.sbin/bsdinstall/scripts/services
Directory Properties:
stable/9/usr.sbin/bsdinstall/ (props changed)
stable/9/usr.sbin/bsdinstall/scripts/ (props changed)
Modified: stable/9/usr.sbin/bsdinstall/bsdinstall
==============================================================================
--- stable/9/usr.sbin/bsdinstall/bsdinstall Wed Mar 13 12:23:14 2013
(r248236)
+++ stable/9/usr.sbin/bsdinstall/bsdinstall Wed Mar 13 13:41:28 2013
(r248237)
@@ -32,12 +32,8 @@
: ${BSDINSTALL_DISTDIR="/usr/freebsd-dist"}; export BSDINSTALL_DISTDIR
: ${BSDINSTALL_CHROOT="/mnt"}; export BSDINSTALL_CHROOT
-VERB=$1; shift
+VERB=${1:-auto}; shift
-if [ -z "$VERB" ]; then
- VERB=auto
-fi
-
-test -d "$BSDINSTALL_TMPETC" || mkdir "$BSDINSTALL_TMPETC"
+[ -d "$BSDINSTALL_TMPETC" ] || mkdir -p "$BSDINSTALL_TMPETC"
echo "Running installation step: $VERB $@" >> "$BSDINSTALL_LOG"
-exec "/usr/libexec/bsdinstall/$VERB" "$@" 2>>"$BSDINSTALL_LOG"
+exec "/usr/libexec/bsdinstall/$VERB" "$@" 2>> "$BSDINSTALL_LOG"
Modified: stable/9/usr.sbin/bsdinstall/bsdinstall.8
==============================================================================
--- stable/9/usr.sbin/bsdinstall/bsdinstall.8 Wed Mar 13 12:23:14 2013
(r248236)
+++ stable/9/usr.sbin/bsdinstall/bsdinstall.8 Wed Mar 13 13:41:28 2013
(r248237)
@@ -26,7 +26,7 @@
.\" $FreeBSD$
.\"
.Dd June 11, 2011
-.Dt bsdinstall 8
+.Dt BSDINSTALL 8
.Os
.Sh NAME
.Nm bsdinstall
Modified: stable/9/usr.sbin/bsdinstall/partedit/gpart_ops.c
==============================================================================
--- stable/9/usr.sbin/bsdinstall/partedit/gpart_ops.c Wed Mar 13 12:23:14
2013 (r248236)
+++ stable/9/usr.sbin/bsdinstall/partedit/gpart_ops.c Wed Mar 13 13:41:28
2013 (r248237)
@@ -147,7 +147,7 @@ newfs_command(const char *fstype, char *
strcat(command, "-F 32 ");
else if (strcmp(items[i].name, "FAT16") == 0)
strcat(command, "-F 16 ");
- else if (strcmp(items[i].name, "SUJ") == 0)
+ else if (strcmp(items[i].name, "FAT12") == 0)
strcat(command, "-F 12 ");
}
} else {
Modified: stable/9/usr.sbin/bsdinstall/partedit/partedit.c
==============================================================================
--- stable/9/usr.sbin/bsdinstall/partedit/partedit.c Wed Mar 13 12:23:14
2013 (r248236)
+++ stable/9/usr.sbin/bsdinstall/partedit/partedit.c Wed Mar 13 13:41:28
2013 (r248237)
@@ -41,6 +41,7 @@
#include "partedit.h"
struct pmetadata_head part_metadata;
+static int sade_mode = 0;
static int apply_changes(struct gmesh *mesh);
static struct partedit_item *read_geom_mesh(struct gmesh *mesh, int *nitems);
@@ -75,12 +76,15 @@ main(int argc, const char **argv)
int i, op, nitems, nscroll;
int error;
+ if (strcmp(basename(argv[0]), "sade") == 0)
+ sade_mode = 1;
+
TAILQ_INIT(&part_metadata);
init_fstab_metadata();
init_dialog(stdin, stdout);
- if (strcmp(basename(argv[0]), "sade") != 0)
+ if (!sade_mode)
dialog_vars.backtitle = __DECONST(char *, "FreeBSD Installer");
dialog_vars.item_help = TRUE;
nscroll = i = 0;
@@ -261,7 +265,7 @@ validate_setup(void)
* Check for root partitions that we aren't formatting, which is
* usually a mistake
*/
- if (root->newfs == NULL) {
+ if (root->newfs == NULL && !sade_mode) {
dialog_vars.defaultno = TRUE;
cancel = dialog_yesno("Warning", "The chosen root partition "
"has a preexisting filesystem. If it contains an existing "
Modified: stable/9/usr.sbin/bsdinstall/partedit/partedit_powerpc.c
==============================================================================
--- stable/9/usr.sbin/bsdinstall/partedit/partedit_powerpc.c Wed Mar 13
12:23:14 2013 (r248236)
+++ stable/9/usr.sbin/bsdinstall/partedit/partedit_powerpc.c Wed Mar 13
13:41:28 2013 (r248237)
@@ -67,7 +67,7 @@ is_scheme_bootable(const char *part_type
size_t
bootpart_size(const char *part_type) {
- if (strcmp(part_type, "APM") == 0)
+ if (strcmp(part_type, "APM") == 0 || strcmp(part_type, "MBR") == 0)
return (800*1024);
return (0);
}
@@ -81,6 +81,8 @@ const char *
partcode_path(const char *part_type) {
if (strcmp(part_type, "APM") == 0)
return ("/boot/boot1.hfs");
+ if (strcmp(part_type, "MBR") == 0)
+ return ("/boot/boot1.elf");
return (NULL);
}
Modified: stable/9/usr.sbin/bsdinstall/scripts/auto
==============================================================================
--- stable/9/usr.sbin/bsdinstall/scripts/auto Wed Mar 13 12:23:14 2013
(r248236)
+++ stable/9/usr.sbin/bsdinstall/scripts/auto Wed Mar 13 13:41:28 2013
(r248237)
@@ -53,15 +53,15 @@ bsdinstall hostname || error
export DISTRIBUTIONS="base.txz kernel.txz"
if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then
- DISTMENU=`cut -f 4,5,6 $BSDINSTALL_DISTDIR/MANIFEST | grep -v -e
^kernel -e ^base`
+ DISTMENU=`awk -F'\t' '!/^(kernel|base)/{print $4,$5,$6}'
$BSDINSTALL_DISTDIR/MANIFEST`
exec 3>&1
- EXTRA_DISTS=$(echo $DISTMENU | xargs dialog \
- --backtitle "FreeBSD Installer" \
- --title "Distribution Select" --nocancel --separate-output \
- --checklist "Choose optional system components to install:" \
- 0 0 0 \
- 2>&1 1>&3)
+ EXTRA_DISTS=$( eval dialog \
+ --backtitle \"FreeBSD Installer\" \
+ --title \"Distribution Select\" --nocancel --separate-output \
+ --checklist \"Choose optional system components to install:\" \
+ 0 0 0 $DISTMENU \
+ 2>&1 1>&3 )
for dist in $EXTRA_DISTS; do
export DISTRIBUTIONS="$DISTRIBUTIONS $dist.txz"
done
@@ -216,6 +216,7 @@ dialog --backtitle "FreeBSD Installer" -
--yesno "The installation is now finished. Before exiting the installer,
would you like to open a shell in the new system to make any final manual
modifications?" 0 0
if [ $? -eq 0 ]; then
clear
+ mount -t devfs devfs "$BSDINSTALL_CHROOT/dev"
echo This shell is operating in a chroot in the new system. \
When finished making configuration changes, type \"exit\".
chroot "$BSDINSTALL_CHROOT" /bin/sh 2>&1
Modified: stable/9/usr.sbin/bsdinstall/scripts/mirrorselect
==============================================================================
--- stable/9/usr.sbin/bsdinstall/scripts/mirrorselect Wed Mar 13 12:23:14
2013 (r248236)
+++ stable/9/usr.sbin/bsdinstall/scripts/mirrorselect Wed Mar 13 13:41:28
2013 (r248237)
@@ -39,8 +39,6 @@ MIRROR=`dialog --backtitle "FreeBSD Inst
--menu "Please select the site closest to you or \"other\" if you'd like
to specify a different choice. Also note that not every site listed here
carries more than the base distribution kits. Only Primary sites are guaranteed
to carry the full range of possible distributions. Select a site that's close!"
\
0 0 0 \
ftp://ftp.freebsd.org "Main Site"\
- ftp://snapshots.jp.freebsd.org "Snapshots Server Japan"\
- ftp://snapshots.se.freebsd.org "Snapshots Server Sweden"\
ftp://ftp.freebsd.org "IPv6 Main Site"\
ftp://ftp3.ie.freebsd.org "IPv6 Ireland"\
ftp://ftp.il.freebsd.org "IPv6 Israel"\
@@ -87,7 +85,7 @@ MIRROR=`dialog --backtitle "FreeBSD Inst
ftp://ftp.fr.freebsd.org "France"\
ftp://ftp2.fr.freebsd.org "IPv6 France #2"\
ftp://ftp3.fr.freebsd.org "France #3"\
- ftp://ftp4.fr.freebsd.org "France #4"\
+ ftp://ftp4.fr.freebsd.org "IPv6 France #4"\
ftp://ftp5.fr.freebsd.org "France #5"\
ftp://ftp6.fr.freebsd.org "France #6"\
ftp://ftp8.fr.freebsd.org "IPv6 France #8"\
@@ -151,6 +149,7 @@ MIRROR=`dialog --backtitle "FreeBSD Inst
ftp://ftp3.se.freebsd.org "Sweden #3"\
ftp://ftp4.se.freebsd.org "Sweden #4"\
ftp://ftp5.se.freebsd.org "Sweden #5"\
+ ftp://ftp6.se.freebsd.org "Sweden #6"\
ftp://ftp.ch.freebsd.org "Switzerland"\
ftp://ftp2.ch.freebsd.org "Switzerland #2"\
ftp://ftp.tw.freebsd.org "Taiwan"\
Modified: stable/9/usr.sbin/bsdinstall/scripts/services
==============================================================================
--- stable/9/usr.sbin/bsdinstall/scripts/services Wed Mar 13 12:23:14
2013 (r248236)
+++ stable/9/usr.sbin/bsdinstall/scripts/services Wed Mar 13 13:41:28
2013 (r248237)
@@ -45,7 +45,7 @@ DAEMONS=$(dialog --backtitle "FreeBSD In
sshd "Secure shell daemon" ${sshd_enable:-off} \
moused "PS/2 mouse pointer on console" ${moused_enable:-off} \
ntpd "Synchronize system and network time" ${ntpd_enable:-off} \
- powerd "Adjust CPU frequency dynamically" ${powerd_enable:-off} \
+ powerd "Adjust CPU frequency dynamically if supported"
${powerd_enable:-off} \
2>&1 1>&3)
exec 3>&-
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
