Mailinglist Archive: yast-commit (535 mails)

< Previous Next >
[yast-commit] r41333 - in /branches/SuSE-SLE-10-SP1-Branch/firstboot: ./ package/ scripts/Firstboot-Stage/ src/ src/data/
  • From: jsuchome@xxxxxxxxxxxxxxxx
  • Date: Wed, 10 Oct 2007 14:08:44 -0000
  • Message-id: <20071010140844.AF6BF2FD2C@xxxxxxxxxxxxxxxx>
Author: jsuchome
Date: Wed Oct 10 16:08:44 2007
New Revision: 41333

URL: http://svn.opensuse.org/viewcvs/yast?rev=41333&view=rev
Log:
- added support for keyboard and restaring network (#F302520)
- added one more client for showing the license + new value
  FIRSTBOOT_NOVELL_LICENSE_DIR to /etc/sysconfig/firstboot (F302865)
- restart kbd after yast is finished (#303808)
- 2.13.8 


Added:
    branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_keyboard.ycp   (with props)
    branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_license_novell.ycp   (with props)
    branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_network_write.ycp   (with props)
Modified:
    branches/SuSE-SLE-10-SP1-Branch/firstboot/VERSION
    branches/SuSE-SLE-10-SP1-Branch/firstboot/package/yast2-firstboot.changes
    branches/SuSE-SLE-10-SP1-Branch/firstboot/scripts/Firstboot-Stage/S05-cleanup
    branches/SuSE-SLE-10-SP1-Branch/firstboot/src/Makefile.am
    branches/SuSE-SLE-10-SP1-Branch/firstboot/src/data/sysconfig.firstboot
    branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_language.ycp

Modified: branches/SuSE-SLE-10-SP1-Branch/firstboot/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/firstboot/VERSION?rev=41333&r1=41332&r2=41333&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP1-Branch/firstboot/VERSION (original)
+++ branches/SuSE-SLE-10-SP1-Branch/firstboot/VERSION Wed Oct 10 16:08:44 2007
@@ -1 +1 @@
-2.13.7
+2.13.8

Modified: branches/SuSE-SLE-10-SP1-Branch/firstboot/package/yast2-firstboot.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/firstboot/package/yast2-firstboot.changes?rev=41333&r1=41332&r2=41333&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP1-Branch/firstboot/package/yast2-firstboot.changes (original)
+++ branches/SuSE-SLE-10-SP1-Branch/firstboot/package/yast2-firstboot.changes Wed Oct 10 16:08:44 2007
@@ -1,4 +1,13 @@
 -------------------------------------------------------------------
+Thu Aug 23 14:57:53 CEST 2007 - jsuchome@xxxxxxx
+
+- added support for keyboard and restaring network (#F302520)
+- added one more client for showing the license + new value
+  FIRSTBOOT_NOVELL_LICENSE_DIR to /etc/sysconfig/firstboot (F302865)
+- restart kbd after yast is finished (#303808)
+- 2.13.8 
+
+-------------------------------------------------------------------
 Thu Mar 15 17:29:01 CET 2007 - jsuchome@xxxxxxx
 
 - unset LC_ALL before starting firstboot stage (#252780)

Modified: branches/SuSE-SLE-10-SP1-Branch/firstboot/scripts/Firstboot-Stage/S05-cleanup
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/firstboot/scripts/Firstboot-Stage/S05-cleanup?rev=41333&r1=41332&r2=41333&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP1-Branch/firstboot/scripts/Firstboot-Stage/S05-cleanup (original)
+++ branches/SuSE-SLE-10-SP1-Branch/firstboot/scripts/Firstboot-Stage/S05-cleanup Wed Oct 10 16:08:44 2007
@@ -42,4 +42,9 @@
        rm -f $IFCFG_USB
 fi
 
+if [ -e "/var/lib/YaST2/firstboot_kbd_restart" ] ; then
+    /etc/init.d/kbd restart
+    rm /var/lib/YaST2/firstboot_kbd_restart
+fi
+
 stop_unicode

Modified: branches/SuSE-SLE-10-SP1-Branch/firstboot/src/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/firstboot/src/Makefile.am?rev=41333&r1=41332&r2=41333&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP1-Branch/firstboot/src/Makefile.am (original)
+++ branches/SuSE-SLE-10-SP1-Branch/firstboot/src/Makefile.am Wed Oct 10 16:08:44 2007
@@ -11,7 +11,10 @@
        firstboot_license.ycp   \
        firstboot_welcome.ycp   \
        firstboot_ssh.ycp       \
-       firstboot.ycp
+       firstboot_keyboard.ycp  \
+       firstboot.ycp           \
+       firstboot_license_novell.ycp    \
+       firstboot_network_write.ycp
 
 ynclude_DATA =                 \
        routines.ycp

Modified: branches/SuSE-SLE-10-SP1-Branch/firstboot/src/data/sysconfig.firstboot
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/firstboot/src/data/sysconfig.firstboot?rev=41333&r1=41332&r2=41333&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP1-Branch/firstboot/src/data/sysconfig.firstboot (original)
+++ branches/SuSE-SLE-10-SP1-Branch/firstboot/src/data/sysconfig.firstboot Wed Oct 10 16:08:44 2007
@@ -24,11 +24,18 @@
 ## Default:     ""
 #
 # Directory from which 'license.txt' and 'license_<locale>.txt' are read
+# This are vendor-specific license texts
 FIRSTBOOT_LICENSE_DIR=""
 
 ## Type:        string
 ## Default:     ""
 #
+# Directory from which 'license.txt' and 'license_<locale>.txt' are read
+FIRSTBOOT_NOVELL_LICENSE_DIR=""
+
+## Type:        string
+## Default:     ""
+#
 # finish text file
 FIRSTBOOT_FINISH_FILE=""
 

Added: branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_keyboard.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_keyboard.ycp?rev=41333&view=auto
==============================================================================
--- branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_keyboard.ycp (added)
+++ branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_keyboard.ycp Wed Oct 10 16:08:44 2007
@@ -0,0 +1,34 @@
+/**
+ * File                : firstboot_keyboard.ycp
+ * Author      : Jiri Suchomel <jsuchome@xxxxxxx>
+ * Purpose     : Firstboot configuratiuon of keyboard
+ *
+ * $Id$
+ */
+{
+    textdomain "country";
+
+    import "Arch";
+    import "Directory";
+    import "Keyboard";
+    import "Firstboot";
+
+    include "keyboard/dialogs.ycp";
+
+    any ret    = `auto;
+    if (Arch::s390 ())
+       return ret;
+
+    Keyboard::Read ();
+
+    ret = KeyboardDialog ($[]);
+
+    if (ret == `next)
+    {
+       Keyboard::Save (false);
+       // kbd must be restarted after YaST finishes (#303808)
+       SCR::Execute (.target.bash, sformat ("touch %1/firstboot_kbd_restart", Directory::vardir));
+    }
+
+    return ret;
+}

Modified: branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_language.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_language.ycp?rev=41333&r1=41332&r2=41333&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_language.ycp (original)
+++ branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_language.ycp Wed Oct 10 16:08:44 2007
@@ -18,15 +18,16 @@
 {
     textdomain "firstboot";
 
+    import "Console";
     import "Language";
     import "Wizard";
     import "Firstboot";
 
     import "Popup";
-    import "Label";
     import "Encoding";
     import "Mode";
     import "GetInstArgs";
+    import "ProductControl";
 
     // Memozize the current language.
     //
@@ -39,7 +40,9 @@
     while (result == `again)
     {
        Wizard::SetDesktopIcon("language");
-        result = WFM::CallFunction ("inst_language", [ GetInstArgs::argmap() ] );
+       map args        = GetInstArgs::argmap();
+       args["first_run"]     = "yes";
+        result = WFM::CallFunction ("inst_language", [ args ] );
        Wizard::RetranslateButtons ();
     }
 
@@ -51,7 +54,6 @@
        //
        y2milestone( "`cancel or `back --> restoring: <%1>", language_on_entry );
 
-       import "Console";
        import "Installation";
 
        boolean use_utf8 = true;                // utf8 is default
@@ -82,10 +84,19 @@
            {
             Firstboot::language_changed = true;
            Language::Save();
+           Console::Save ();
            y2milestone( "Language changed --> saving" );
-
-           // popup text
-           Popup::Message(  _("Your language setting has been changed.
+           boolean firstboot_keyboard  = false;
+           foreach (map mod, ProductControl::getModules( "firstboot", Mode::mode (), `enabled), {
+               if (mod["name"]:"" == "firstboot_keyboard" && mod["enabled"]:false)
+               {
+                   y2milestone ("keyboard will be configured -> no warning");
+                   firstboot_keyboard  = true;
+               }
+           });
+           if (!firstboot_keyboard)
+               // popup text
+               Popup::Message(  _("Your language setting has been changed.
 
 If necessary, you may want to adapt your keyboard settings to the new
 language. This is possible either in the YaST2 Control Center or by 

Added: branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_license_novell.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_license_novell.ycp?rev=41333&view=auto
==============================================================================
--- branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_license_novell.ycp (added)
+++ branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_license_novell.ycp Wed Oct 10 16:08:44 2007
@@ -0,0 +1,35 @@
+/*
+ * Module : firstboot_license_novell.ycp
+ * Authors: Ladislav Slezak <lslezak@xxxxxxx>, Jiri Suchomel <jsuchome@xxxxxxx>
+ * Purpose: Display Novell license at the start of firstboot
+ *
+ * $Id:$
+ */
+
+{
+    textdomain "firstboot";
+
+    import "Misc";
+    import "GetInstArgs";
+
+
+    any result = nil;
+
+    map args = GetInstArgs::argmap();
+    args["directory"] =  Misc::SysconfigRead(.sysconfig.firstboot.FIRSTBOOT_NOVELL_LICENSE_DIR, "");
+    args["action"] = Misc::SysconfigRead(.sysconfig.firstboot.LICENSE_REFUSAL_ACTION, "abort");
+
+    y2milestone("inst_license options: %1", args);
+
+    result = WFM::CallFunction( "inst_license", [ args ] );
+
+    if (result == `halt)
+    {
+       UI::CloseDialog();
+       y2milestone("Halting the system...");
+       SCR::Execute(.target.bash, "/sbin/halt");
+    }
+
+    return result;
+
+}

Added: branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_network_write.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_network_write.ycp?rev=41333&view=auto
==============================================================================
--- branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_network_write.ycp (added)
+++ branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_network_write.ycp Wed Oct 10 16:08:44 2007
@@ -0,0 +1,16 @@
+/**
+ * File                : firstboot_network_write.ycp
+ * Author      : Jiri Suchomel <jsuchome@xxxxxxx>
+ * Purpose     : Save network configuration
+ *              (usable when network proposal was not run)
+ * $Id$
+ */
+{
+    // currently only restart the service, may be enhanced later
+
+    import "Service";
+
+    Service::Restart ("network");
+
+    return `auto;
+}

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages