installer: Remove unused code to update /usr/src with cvsup.
authorSascha Wildner <saw@online.de>
Sat, 18 Sep 2010 17:05:42 +0000 (19:05 +0200)
committerSascha Wildner <saw@online.de>
Sun, 19 Sep 2010 09:14:02 +0000 (11:14 +0200)
share/installer/cmdnames.conf
usr.sbin/installer/dfuibe_installer/flow.c
usr.sbin/installer/dfuibe_installer/fn.h
usr.sbin/installer/dfuibe_installer/fn_configure.c

index 6d5f66d..ceb0cc5 100644 (file)
@@ -71,7 +71,6 @@ VIDCONTROL=usr/sbin/vidcontrol
 
 DHCPD=usr/pkg/sbin/dhcpd
 
-CVSUP=usr/local/bin/cvsup
 MEMTEST=usr/local/bin/memtest
 
 # These aren't commands, but they're configurable here nonetheless.
index f532a81..9f44e76 100644 (file)
@@ -445,9 +445,6 @@ state_configure_menu(struct i_fn_args *a)
                    _("Set the password that the root (superuser) account will use"), "",
                    "a", "add_user", _("Add a user"),
                    _("Add a user to the system"), "",
-                   /*
-                   "a",        "cvsup_sources","Synchronize system sources", "", "",
-                   */
                    "a", "assign_ip", _("Configure network interfaces"),
                    _("Set up network interfaces (NICs, ethernet, TCP/IP, etc)"), "",
                    "a", "assign_hostname_domain",
@@ -488,8 +485,6 @@ state_configure_menu(struct i_fn_args *a)
                        fn_root_passwd(a);
                } else if (strcmp(dfui_response_get_action_id(r), "add_user") == 0) {
                        fn_add_user(a);
-               } else if (strcmp(dfui_response_get_action_id(r), "cvsup_sources") == 0) {
-                       fn_cvsup_sources(a);
                } else if (strcmp(dfui_response_get_action_id(r), "install_pkgs") == 0) {
                        fn_install_packages(a);
                } else if (strcmp(dfui_response_get_action_id(r), "remove_pkgs") == 0) {
index 8ec1b38..3b2b5ef 100644 (file)
@@ -55,7 +55,6 @@ void           fn_select_slice(struct i_fn_args *);
 
 void            fn_root_passwd(struct i_fn_args *);
 void            fn_add_user(struct i_fn_args *);
-void            fn_cvsup_sources(struct i_fn_args *);
 void            fn_install_packages(struct i_fn_args *);
 void            fn_remove_packages(struct i_fn_args *);
 void            fn_select_services(struct i_fn_args *);
index dc4fde3..39aa517 100644 (file)
@@ -336,25 +336,6 @@ fn_root_passwd(struct i_fn_args *a)
        dfui_form_free(f);
 }
 
-void
-fn_cvsup_sources(struct i_fn_args *a)
-{
-       struct commands *cmds;
-
-       inform(a->c, _("The system has issued a cvsup command in the background.\n\nPlease tail /tmp/cvsupdate.log if you wish to follow the progress."));
-
-       // TODO: This needs a lot more work.
-
-       cmds = commands_new();
-       command_add(cmds, "%s%s -h cvsup.dragonflybsd.com -b /usr "
-           "/usr/share/examples/cvsup/DragonFly-supfile >/tmp/cvsupdate.log",
-           a->os_root, cmd_name(a, "CVSUP"));
-       if (!commands_execute(a, cmds))
-           inform(a->c, _("Warning: could not launch cvsup"));
-
-       commands_free(cmds);
-}
-
 void
 fn_install_packages(struct i_fn_args *a)
 {