Re: svn commit: r209832 - head/usr.sbin/sysinstall
On Thursday, July 08, 2010 7:26:33 pm Doug Barton wrote: On Thu, 8 Jul 2010, Randi Harper wrote: On Thu, Jul 8, 2010 at 2:28 PM, Gabor Kovesdan ga...@freebsd.org wrote: Em 2010.07.08. 23:26, Randi Harper escreveu: Author: randi Date: Thu Jul 8 21:26:26 2010 New Revision: 209832 URL: http://svn.freebsd.org/changeset/base/209832 Log: Revert r209787 pending further discussion. Approved by: cperciva (mentor) Thanks! As I mentioned on IRC, I'll also try to improve this feature, I'm just very busy with other projects at the moment. Unfortunately the road to the current sysinstall hell was paved with just such good intentions. My suggestion is that we all get out of the way of the people who are, actually, DOING the work. :) As was mentioned on IRC, I think a good stopgap would be to at least remove the upgrade option from the main menu. It's not really an acceptable form of upgrade, it doesn't do an intelligent merging of config files. It would be better placed in the Fixit submenu if we're going to be leaving it around for a while and renaming it to something like Mangle My Filesystem. :P Sounds like a better option would be to just remove it from the menu altogether and ifdef 0 the code. That way if $SOMEONE wants to step in and fix the existing code within a reasonable period of time (6 months or less?) then they will still have that option, but users won't suffer in the meantime. Well, this assumes that the existing code is completely broken, but that isn't true. Some people find the existing functionality useful. I'm sure it could be improved, but if the existing functionality is useful I don't see why it has to be disabled. -- John Baldwin ___ 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
Re: svn commit: r209832 - head/usr.sbin/sysinstall
On Thu, 2010-07-08 at 21:26 +, Randi Harper wrote: Author: randi Date: Thu Jul 8 21:26:26 2010 New Revision: 209832 URL: http://svn.freebsd.org/changeset/base/209832 Log: Revert r209787 pending further discussion. Approved by:cperciva (mentor) Thank you. Gaivn ___ 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
Re: svn commit: r209832 - head/usr.sbin/sysinstall
In message: alpine.bsf.2.00.1007081623440.17...@yncgbc.qbhto.arg Doug Barton do...@freebsd.org writes: : On Thu, 8 Jul 2010, Randi Harper wrote: : : On Thu, Jul 8, 2010 at 2:28 PM, Gabor Kovesdan ga...@freebsd.org : wrote: : Em 2010.07.08. 23:26, Randi Harper escreveu: : : Author: randi : Date: Thu Jul 8 21:26:26 2010 : New Revision: 209832 : URL: http://svn.freebsd.org/changeset/base/209832 : : Log: : Revert r209787 pending further discussion. : : Approved by: cperciva (mentor) : : : Thanks! As I mentioned on IRC, I'll also try to improve this feature, : I'm : just very busy with other projects at the moment. : : Unfortunately the road to the current sysinstall hell was paved with : just such good intentions. My suggestion is that we all get out of the : way of the people who are, actually, DOING the work. :) For this specific option, however, what harm would there be in leaving well enough alone? Or, failing that, adding (experts only) to it? : As was mentioned on IRC, I think a good stopgap would be to at least : remove the upgrade option from the main menu. It's not really an : acceptable form of upgrade, it doesn't do an intelligent merging of : config files. It would be better placed in the Fixit submenu if we're : going to be leaving it around for a while and renaming it to something : like Mangle My Filesystem. :P : : Sounds like a better option would be to just remove it from the menu : altogether and ifdef 0 the code. That way if $SOMEONE wants to step in : and fix the existing code within a reasonable period of time (6 months : or less?) then they will still have that option, but users won't : suffer in the meantime. In 6 months, I suspect there will be a very different field of play in the installer space. Warner ___ 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
svn commit: r209832 - head/usr.sbin/sysinstall
Author: randi
Date: Thu Jul 8 21:26:26 2010
New Revision: 209832
URL: http://svn.freebsd.org/changeset/base/209832
Log:
Revert r209787 pending further discussion.
Approved by: cperciva (mentor)
Added:
head/usr.sbin/sysinstall/installUpgrade.c
- copied unchanged from r209786, head/usr.sbin/sysinstall/installUpgrade.c
Modified:
head/usr.sbin/sysinstall/Makefile
head/usr.sbin/sysinstall/dispatch.c
head/usr.sbin/sysinstall/install.c
head/usr.sbin/sysinstall/menus.c
head/usr.sbin/sysinstall/sysinstall.8
head/usr.sbin/sysinstall/sysinstall.h
Modified: head/usr.sbin/sysinstall/Makefile
==
--- head/usr.sbin/sysinstall/Makefile Thu Jul 8 21:02:31 2010
(r209831)
+++ head/usr.sbin/sysinstall/Makefile Thu Jul 8 21:26:26 2010
(r209832)
@@ -8,7 +8,7 @@ PROG= sysinstall
MAN= sysinstall.8
SRCS= anonFTP.c cdrom.c command.c config.c devices.c dhcp.c \
disks.c dispatch.c dist.c dmenu.c doc.c dos.c floppy.c \
- ftp.c globals.c http.c index.c install.c keymap.c \
+ ftp.c globals.c http.c index.c install.c installUpgrade.c keymap.c \
label.c main.c makedevs.c media.c menus.c misc.c modules.c \
mouse.c msg.c network.c nfs.c options.c package.c \
system.c tcpip.c termcap.c ttys.c ufs.c usb.c user.c \
Modified: head/usr.sbin/sysinstall/dispatch.c
==
--- head/usr.sbin/sysinstall/dispatch.c Thu Jul 8 21:02:31 2010
(r209831)
+++ head/usr.sbin/sysinstall/dispatch.c Thu Jul 8 21:26:26 2010
(r209832)
@@ -82,6 +82,7 @@ static struct _word {
{ installCommit, installCommit },
{ installExpress,installExpress },
{ installStandard, installStandard },
+{ installUpgrade,installUpgrade },
{ installFixupBase, installFixupBase},
{ installFixitHoloShell, installFixitHoloShell },
{ installFixitCDROM, installFixitCDROM },
Modified: head/usr.sbin/sysinstall/install.c
==
--- head/usr.sbin/sysinstall/install.c Thu Jul 8 21:02:31 2010
(r209831)
+++ head/usr.sbin/sysinstall/install.c Thu Jul 8 21:26:26 2010
(r209832)
@@ -1032,11 +1032,13 @@ installFilesystems(dialogMenuItem *self)
Device **devs;
PartInfo *root;
char dname[80];
+Boolean upgrade = FALSE;
/* If we've already done this, bail out */
if (!variable_cmp(DISK_LABELLED, written))
return DITEM_SUCCESS;
+upgrade = !variable_cmp(SYSTEM_STATE, upgrade);
if (!checkLabels(TRUE))
return DITEM_FAILURE;
@@ -1076,7 +1078,9 @@ installFilesystems(dialogMenuItem *self)
if (strcmp(root-mountpoint, /))
msgConfirm(Warning: %s is marked as a root partition but is
mounted on %s, RootChunk-name, root-mountpoint);
- if (root-do_newfs) {
+ if (root-do_newfs (!upgrade ||
+ !msgNoYes(You are upgrading - are you SURE you want to newfs
+ the root partition?))) {
int i;
dialog_clear_norefresh();
@@ -1089,7 +1093,9 @@ installFilesystems(dialogMenuItem *self)
}
}
else {
- msgConfirm(Warning: Using existing root partition.);
+ if (!upgrade) {
+ msgConfirm(Warning: Using existing root partition.);
+ }
dialog_clear_norefresh();
msgNotify(Checking integrity of existing %s filesystem., dname);
i = vsystem(fsck_ffs -y %s, dname);
@@ -1173,7 +1179,9 @@ installFilesystems(dialogMenuItem *self)
sprintf(dname, %s/dev/%s,
RunningAsInit ? /mnt : , c2-name);
- if (tmp-do_newfs)
+ if (tmp-do_newfs (!upgrade ||
+ !msgNoYes(You are upgrading - are you SURE you
+want to newfs /dev/%s?, c2-name)))
performNewfs(tmp, dname, QUEUE_YES);
else
command_shell_add(tmp-mountpoint,
@@ -1206,7 +1214,7 @@ installFilesystems(dialogMenuItem *self)
}
}
else if (c1-type == fat c1-private_data
- (root-do_newfs)) {
+ (root-do_newfs || upgrade)) {
char name[FILENAME_MAX];
sprintf(name, %s/%s, RunningAsInit ? /mnt : , ((PartInfo
*)c1-private_data)-mountpoint);
@@ -1219,7 +1227,9 @@ installFilesystems(dialogMenuItem *self)
sprintf(dname, %s/dev/%s, RunningAsInit ? /mnt : ,
c1-name);
- if (pi-do_newfs)
+ if (pi-do_newfs (!upgrade ||
+ !msgNoYes(You are upgrading - are you SURE you want to
+
Re: svn commit: r209832 - head/usr.sbin/sysinstall
Em 2010.07.08. 23:26, Randi Harper escreveu: Author: randi Date: Thu Jul 8 21:26:26 2010 New Revision: 209832 URL: http://svn.freebsd.org/changeset/base/209832 Log: Revert r209787 pending further discussion. Approved by: cperciva (mentor) Thanks! As I mentioned on IRC, I'll also try to improve this feature, I'm just very busy with other projects at the moment. Gabor ___ 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
Re: svn commit: r209832 - head/usr.sbin/sysinstall
On Thu, Jul 8, 2010 at 2:28 PM, Gabor Kovesdan ga...@freebsd.org wrote: Em 2010.07.08. 23:26, Randi Harper escreveu: Author: randi Date: Thu Jul 8 21:26:26 2010 New Revision: 209832 URL: http://svn.freebsd.org/changeset/base/209832 Log: Revert r209787 pending further discussion. Approved by: cperciva (mentor) Thanks! As I mentioned on IRC, I'll also try to improve this feature, I'm just very busy with other projects at the moment. Gabor As was mentioned on IRC, I think a good stopgap would be to at least remove the upgrade option from the main menu. It's not really an acceptable form of upgrade, it doesn't do an intelligent merging of config files. It would be better placed in the Fixit submenu if we're going to be leaving it around for a while and renaming it to something like Mangle My Filesystem. :P -- randi ___ 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
Re: svn commit: r209832 - head/usr.sbin/sysinstall
On Thu, 8 Jul 2010, Randi Harper wrote: On Thu, Jul 8, 2010 at 2:28 PM, Gabor Kovesdan ga...@freebsd.org wrote: Em 2010.07.08. 23:26, Randi Harper escreveu: Author: randi Date: Thu Jul 8 21:26:26 2010 New Revision: 209832 URL: http://svn.freebsd.org/changeset/base/209832 Log: Revert r209787 pending further discussion. Approved by: cperciva (mentor) Thanks! As I mentioned on IRC, I'll also try to improve this feature, I'm just very busy with other projects at the moment. Unfortunately the road to the current sysinstall hell was paved with just such good intentions. My suggestion is that we all get out of the way of the people who are, actually, DOING the work. :) As was mentioned on IRC, I think a good stopgap would be to at least remove the upgrade option from the main menu. It's not really an acceptable form of upgrade, it doesn't do an intelligent merging of config files. It would be better placed in the Fixit submenu if we're going to be leaving it around for a while and renaming it to something like Mangle My Filesystem. :P Sounds like a better option would be to just remove it from the menu altogether and ifdef 0 the code. That way if $SOMEONE wants to step in and fix the existing code within a reasonable period of time (6 months or less?) then they will still have that option, but users won't suffer in the meantime. Doug -- Improve the effectiveness of your Internet presence with a domain name makeover!http://SupersetSolutions.com/ Computers are useless. They can only give you answers. -- Pablo Picasso ___ 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
