Menu
▾
▴
morphix-cvs — A list for all cvs commits done, to easily keep track of development
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(23) |
Nov
(20) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(43) |
Feb
(31) |
Mar
(99) |
Apr
(57) |
May
(82) |
Jun
(73) |
Jul
(123) |
Aug
(634) |
Sep
(588) |
Oct
(264) |
Nov
(217) |
Dec
(179) |
| 2005 |
Jan
(262) |
Feb
(273) |
Mar
(164) |
Apr
(88) |
May
(23) |
Jun
(10) |
Jul
(8) |
Aug
(19) |
Sep
(112) |
Oct
(57) |
Nov
(71) |
Dec
(6) |
| 2006 |
Jan
(14) |
Feb
(48) |
Mar
(56) |
Apr
(21) |
May
(77) |
Jun
(46) |
Jul
(47) |
Aug
(27) |
Sep
(18) |
Oct
(16) |
Nov
(4) |
Dec
(18) |
| 2007 |
Jan
(2) |
Feb
(6) |
Mar
(2) |
Apr
(27) |
May
(13) |
Jun
(27) |
Jul
(20) |
Aug
(3) |
Sep
(3) |
Oct
(23) |
Nov
(21) |
Dec
(6) |
| 2008 |
Jan
(7) |
Feb
(3) |
Mar
(4) |
Apr
(8) |
May
(3) |
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(11) |
Feb
(1) |
Mar
(8) |
Apr
|
May
|
Jun
(4) |
Jul
(6) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|
From: <ale...@us...> - 2004-01-10 10:25:34
|
Update of /cvsroot/morphix/partitionmorpher
In directory sc8-pr-cvs1:/tmp/cvs-serv15233
Modified Files:
partitionmorpher.glade translation
Log Message:
major restructuring, added wrapper functions for do_functions for integration
with pm_fswrap, dynamic fs types. start on wizard
Index: partitionmorpher.glade
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/partitionmorpher.glade,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** partitionmorpher.glade 2 Jan 2004 15:17:31 -0000 1.9
--- partitionmorpher.glade 10 Jan 2004 10:25:31 -0000 1.10
***************
*** 385,389 ****
<property name="reorderable">False</property>
<property name="enable_search">False</property>
- <signal name="row_activated" handler="on_treeview1_row_activated" last_modification_time="Thu, 06 Mar 2003 23:53:49 GMT"/>
</widget>
</child>
--- 385,388 ----
***************
*** 521,525 ****
<property name="border_width">5</property>
<property name="visible">True</property>
! <property name="n_rows">13</property>
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
--- 520,524 ----
<property name="border_width">5</property>
<property name="visible">True</property>
! <property name="n_rows">12</property>
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
***************
*** 556,644 ****
<property name="tooltip" translatable="yes">Select the filesystem type. None is default. For an ordinary filesystem, you should choose one of the next 4 options. If you want a swap partition, select the 6th option</property>
<property name="can_focus">True</property>
! <property name="history">0</property>
<child>
<widget class="GtkMenu" id="menu7">
-
- <child>
- <widget class="GtkMenuItem" id="none1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">None</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_none1_activate" last_modification_time="Fri, 18 Apr 2003 01:00:42 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="separator6">
- <property name="visible">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="ext3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">ext3</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_ext3_activate" last_modification_time="Sun, 06 Apr 2003 00:42:36 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="ext2">
- <property name="visible">True</property>
- <property name="label" translatable="yes">ext2</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_ext2_activate" last_modification_time="Sun, 06 Apr 2003 00:42:36 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="reiserfs1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">reiserfs</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_reiserfs1_activate" last_modification_time="Sun, 06 Apr 2003 00:42:36 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="separator5">
- <property name="visible">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="swap1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Swap</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_swap1_activate" last_modification_time="Fri, 18 Apr 2003 01:14:18 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="separator8">
- <property name="visible">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="fat1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">fat32</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_fat1_activate" last_modification_time="Fri, 18 Apr 2003 01:22:05 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="fat2">
- <property name="visible">True</property>
- <property name="label" translatable="yes">fat16</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_fat2_activate" last_modification_time="Fri, 18 Apr 2003 01:22:05 GMT"/>
- </widget>
- </child>
</widget>
</child>
--- 555,562 ----
<property name="tooltip" translatable="yes">Select the filesystem type. None is default. For an ordinary filesystem, you should choose one of the next 4 options. If you want a swap partition, select the 6th option</property>
<property name="can_focus">True</property>
! <property name="history">-1</property>
<child>
<widget class="GtkMenu" id="menu7">
</widget>
</child>
***************
*** 741,816 ****
<child>
- <widget class="GtkLabel" id="label11">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Partition Size</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">12</property>
- <property name="bottom_attach">13</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label10">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Max Size:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">11</property>
- <property name="bottom_attach">12</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="CreateMaxLabel">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">11</property>
- <property name="bottom_attach">12</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
<widget class="GtkLabel" id="label65">
<property name="visible">True</property>
--- 659,662 ----
***************
*** 933,960 ****
<child>
- <widget class="GtkLabel" id="label70">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">10</property>
- <property name="bottom_attach">11</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
<widget class="GtkCheckButton" id="CreateBootFlagCheckbutton">
<property name="visible">True</property>
--- 779,782 ----
***************
*** 979,998 ****
<child>
! <widget class="GtkCheckButton" id="CreateRootFlagCheckbutton">
! <property name="can_focus">True</property>
! <property name="label" translatable="yes">Root Partition</property>
! <property name="use_underline">True</property>
! <property name="relief">GTK_RELIEF_NORMAL</property>
! <property name="active">False</property>
! <property name="inconsistent">False</property>
! <property name="draw_indicator">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
! <property name="top_attach">6</property>
! <property name="bottom_attach">7</property>
<property name="x_options">fill</property>
! <property name="y_options"></property>
</packing>
</child>
--- 801,880 ----
<child>
! <widget class="GtkVBox" id="vbox9">
! <property name="visible">True</property>
! <property name="homogeneous">False</property>
! <property name="spacing">0</property>
!
! <child>
! <widget class="GtkRadioButton" id="CreatePrimaryRadiobutton">
! <property name="visible">True</property>
! <property name="can_focus">True</property>
! <property name="label" translatable="yes">Primary</property>
! <property name="use_underline">True</property>
! <property name="relief">GTK_RELIEF_NORMAL</property>
! <property name="active">False</property>
! <property name="inconsistent">False</property>
! <property name="draw_indicator">True</property>
! <signal name="toggled" handler="on_CreatePrimaryRadiobutton_toggled" last_modification_time="Sun, 12 Oct 2003 01:16:33 GMT"/>
! <signal name="clicked" handler="on_CreateTypeRadiobutton_clicked" last_modification_time="Fri, 12 Sep 2003 18:22:21 GMT"/>
! </widget>
! <packing>
! <property name="padding">0</property>
! <property name="expand">False</property>
! <property name="fill">False</property>
! </packing>
! </child>
!
! <child>
! <widget class="GtkRadioButton" id="CreateExtendedRadiobutton">
! <property name="visible">True</property>
! <property name="tooltip" translatable="yes">An Extended partition merely holds Logical partitions.</property>
! <property name="can_focus">True</property>
! <property name="label" translatable="yes">Extended</property>
! <property name="use_underline">True</property>
! <property name="relief">GTK_RELIEF_NORMAL</property>
! <property name="active">False</property>
! <property name="inconsistent">False</property>
! <property name="draw_indicator">True</property>
! <property name="group">CreatePrimaryRadiobutton</property>
! <signal name="toggled" handler="on_CreateExtendedRadiobutton_toggled" last_modification_time="Sun, 12 Oct 2003 01:16:48 GMT"/>
! <signal name="clicked" handler="on_CreateTypeRadiobutton_clicked" last_modification_time="Fri, 12 Sep 2003 18:09:20 GMT"/>
! </widget>
! <packing>
! <property name="padding">0</property>
! <property name="expand">False</property>
! <property name="fill">False</property>
! </packing>
! </child>
!
! <child>
! <widget class="GtkRadioButton" id="CreateLogicalRadiobutton">
! <property name="visible">True</property>
! <property name="tooltip" translatable="yes">You can have any number of Logical partions inside an Extended partition.</property>
! <property name="can_focus">True</property>
! <property name="label" translatable="yes">Logical</property>
! <property name="use_underline">True</property>
! <property name="relief">GTK_RELIEF_NORMAL</property>
! <property name="active">False</property>
! <property name="inconsistent">False</property>
! <property name="draw_indicator">True</property>
! <property name="group">CreatePrimaryRadiobutton</property>
! <signal name="toggled" handler="on_CreateLogicalRadiobutton_toggled" last_modification_time="Sun, 12 Oct 2003 01:16:52 GMT"/>
! <signal name="clicked" handler="on_CreateTypeRadiobutton_clicked" last_modification_time="Fri, 12 Sep 2003 18:22:43 GMT"/>
! </widget>
! <packing>
! <property name="padding">0</property>
! <property name="expand">False</property>
! <property name="fill">False</property>
! </packing>
! </child>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
! <property name="top_attach">2</property>
! <property name="bottom_attach">3</property>
<property name="x_options">fill</property>
! <property name="y_options">fill</property>
</packing>
</child>
***************
*** 1013,1018 ****
<property name="left_attach">1</property>
<property name="right_attach">2</property>
! <property name="top_attach">7</property>
! <property name="bottom_attach">8</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
--- 895,900 ----
<property name="left_attach">1</property>
<property name="right_attach">2</property>
! <property name="top_attach">6</property>
! <property name="bottom_attach">7</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
***************
*** 1035,1040 ****
<property name="left_attach">1</property>
<property name="right_attach">2</property>
! <property name="top_attach">8</property>
! <property name="bottom_attach">9</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
--- 917,922 ----
<property name="left_attach">1</property>
<property name="right_attach">2</property>
! <property name="top_attach">7</property>
! <property name="bottom_attach">8</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
***************
*** 1057,1062 ****
<property name="left_attach">1</property>
<property name="right_attach">2</property>
! <property name="top_attach">9</property>
! <property name="bottom_attach">10</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
--- 939,944 ----
<property name="left_attach">1</property>
<property name="right_attach">2</property>
! <property name="top_attach">8</property>
! <property name="bottom_attach">9</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
***************
*** 1079,1082 ****
--- 961,988 ----
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">9</property>
+ <property name="bottom_attach">10</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Max Size:</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
<property name="top_attach">10</property>
<property name="bottom_attach">11</property>
***************
*** 1087,1166 ****
<child>
! <widget class="GtkVBox" id="vbox9">
<property name="visible">True</property>
! <property name="homogeneous">False</property>
! <property name="spacing">0</property>
!
! <child>
! <widget class="GtkRadioButton" id="CreatePrimaryRadiobutton">
! <property name="visible">True</property>
! <property name="can_focus">True</property>
! <property name="label" translatable="yes">Primary</property>
! <property name="use_underline">True</property>
! <property name="relief">GTK_RELIEF_NORMAL</property>
! <property name="active">False</property>
! <property name="inconsistent">False</property>
! <property name="draw_indicator">True</property>
! <signal name="toggled" handler="on_CreatePrimaryRadiobutton_toggled" last_modification_time="Sun, 12 Oct 2003 01:16:33 GMT"/>
! <signal name="clicked" handler="on_CreateTypeRadiobutton_clicked" last_modification_time="Fri, 12 Sep 2003 18:22:21 GMT"/>
! </widget>
! <packing>
! <property name="padding">0</property>
! <property name="expand">False</property>
! <property name="fill">False</property>
! </packing>
! </child>
!
! <child>
! <widget class="GtkRadioButton" id="CreateExtendedRadiobutton">
! <property name="visible">True</property>
! <property name="tooltip" translatable="yes">An Extended partition merely holds Logical partitions.</property>
! <property name="can_focus">True</property>
! <property name="label" translatable="yes">Extended</property>
! <property name="use_underline">True</property>
! <property name="relief">GTK_RELIEF_NORMAL</property>
! <property name="active">False</property>
! <property name="inconsistent">False</property>
! <property name="draw_indicator">True</property>
! <property name="group">CreatePrimaryRadiobutton</property>
! <signal name="toggled" handler="on_CreateExtendedRadiobutton_toggled" last_modification_time="Sun, 12 Oct 2003 01:16:48 GMT"/>
! <signal name="clicked" handler="on_CreateTypeRadiobutton_clicked" last_modification_time="Fri, 12 Sep 2003 18:09:20 GMT"/>
! </widget>
! <packing>
! <property name="padding">0</property>
! <property name="expand">False</property>
! <property name="fill">False</property>
! </packing>
! </child>
!
! <child>
! <widget class="GtkRadioButton" id="CreateLogicalRadiobutton">
! <property name="visible">True</property>
! <property name="tooltip" translatable="yes">You can have any number of Logical partions inside an Extended partition.</property>
! <property name="can_focus">True</property>
! <property name="label" translatable="yes">Logical</property>
! <property name="use_underline">True</property>
! <property name="relief">GTK_RELIEF_NORMAL</property>
! <property name="active">False</property>
! <property name="inconsistent">False</property>
! <property name="draw_indicator">True</property>
! <property name="group">CreatePrimaryRadiobutton</property>
! <signal name="toggled" handler="on_CreateLogicalRadiobutton_toggled" last_modification_time="Sun, 12 Oct 2003 01:16:52 GMT"/>
! <signal name="clicked" handler="on_CreateTypeRadiobutton_clicked" last_modification_time="Fri, 12 Sep 2003 18:22:43 GMT"/>
! </widget>
! <packing>
! <property name="padding">0</property>
! <property name="expand">False</property>
! <property name="fill">False</property>
! </packing>
! </child>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
! <property name="top_attach">2</property>
! <property name="bottom_attach">3</property>
<property name="x_options">fill</property>
! <property name="y_options">fill</property>
</packing>
</child>
--- 993,1040 ----
<child>
! <widget class="GtkLabel" id="CreateMaxLabel">
<property name="visible">True</property>
! <property name="label" translatable="yes"></property>
! <property name="use_underline">False</property>
! <property name="use_markup">False</property>
! <property name="justify">GTK_JUSTIFY_LEFT</property>
! <property name="wrap">False</property>
! <property name="selectable">False</property>
! <property name="xalign">0</property>
! <property name="yalign">0.5</property>
! <property name="xpad">0</property>
! <property name="ypad">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
! <property name="top_attach">10</property>
! <property name="bottom_attach">11</property>
<property name="x_options">fill</property>
! <property name="y_options"></property>
! </packing>
! </child>
!
! <child>
! <widget class="GtkLabel" id="label11">
! <property name="visible">True</property>
! <property name="label" translatable="yes">Partition Size</property>
! <property name="use_underline">False</property>
! <property name="use_markup">False</property>
! <property name="justify">GTK_JUSTIFY_LEFT</property>
! <property name="wrap">False</property>
! <property name="selectable">False</property>
! <property name="xalign">0</property>
! <property name="yalign">0.5</property>
! <property name="xpad">0</property>
! <property name="ypad">0</property>
! </widget>
! <packing>
! <property name="left_attach">0</property>
! <property name="right_attach">1</property>
! <property name="top_attach">11</property>
! <property name="bottom_attach">12</property>
! <property name="x_options">fill</property>
! <property name="y_options"></property>
</packing>
</child>
***************
*** 1181,1186 ****
<property name="left_attach">1</property>
<property name="right_attach">2</property>
! <property name="top_attach">12</property>
! <property name="bottom_attach">13</property>
<property name="y_options"></property>
</packing>
--- 1055,1060 ----
<property name="left_attach">1</property>
<property name="right_attach">2</property>
! <property name="top_attach">11</property>
! <property name="bottom_attach">12</property>
<property name="y_options"></property>
</packing>
***************
*** 3542,3545 ****
--- 3416,3778 ----
<property name="expand">False</property>
<property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+
+ <widget class="GtkDialog" id="WizardWindow">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Partition Morpher - Wizard mode</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="has_separator">True</property>
+
+ <child internal-child="vbox">
+ <widget class="GtkVBox" id="dialog-vbox14">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child internal-child="action_area">
+ <widget class="GtkHButtonBox" id="dialog-action_area14">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+ <child>
+ <widget class="GtkButton" id="helpbutton6">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-help</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="response_id">-11</property>
+ <signal name="clicked" handler="on_helpbutton6_clicked" last_modification_time="Tue, 06 Jan 2004 13:43:23 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="cancelbutton11">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-go-back</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="response_id">-6</property>
+ <signal name="clicked" handler="on_cancelbutton11_clicked" last_modification_time="Tue, 06 Jan 2004 13:43:18 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="okbutton7">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-ok</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="response_id">-5</property>
+ <signal name="clicked" handler="on_okbutton7_clicked" last_modification_time="Tue, 06 Jan 2004 13:43:13 GMT"/>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVBox" id="vbox16">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox13">
+ <property name="border_width">8</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">8</property>
+
+ <child>
+ <widget class="GtkImage" id="image8">
+ <property name="visible">True</property>
+ <property name="stock">gtk-dialog-question</property>
+ <property name="icon_size">6</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label78">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Welcome to the Partition Morpher Wizard
+ This tool will allow you to easily partition your harddisk
+ to let you install a new Linux distribution (ie. Morphix)</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">True</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHSeparator" id="hseparator4">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVBox" id="vbox17">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="label79">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Detected Partition modes:</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVBox" id="vboxModes">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkVBox" id="vboxFreeSpace">
+ <property name="border_width">8</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkRadioButton" id="radiobutton1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">use all free space</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label80">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">You have enough free space available already to install Morphix without having to resize other partitions.
+ <b>This mode will not touch your existing data.</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">True</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVBox" id="vboxResize">
+ <property name="border_width">8</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkRadioButton" id="radiobutton2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">resize other partitions</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label81">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Attempt to resize your current partitions and use the occuring free space to create new Linux partitions for Morphix. If you have ntfs partitions you are advised to defragment these first in Windows(tm).
+ <b>You are advised to back up your data first!</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">True</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVBox" id="vboxDestructive">
+ <property name="border_width">8</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkRadioButton" id="radiobutton3">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">remove existing partitions</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label82">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Remove all existing partitions on the selected harddisk and use all the resulting free space to create new Linux partitions for Morphix.
+ <b>THIS MODE WILL DELETE ALL YOUR EXISTING DATA!
+ YOU HAVE BEEN WARNED!</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">True</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
Index: translation
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/translation,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** translation 2 Jan 2004 15:17:31 -0000 1.8
--- translation 10 Jan 2004 10:25:31 -0000 1.9
***************
*** 35,45 ****
gchar *s = N_("Filesystem Type:");
gchar *s = N_("Select the filesystem type. None is default. For an ordinary filesystem, you should choose one of the next 4 options. If you want a swap partition, select the 6th option");
- gchar *s = N_("None");
- gchar *s = N_("ext3");
- gchar *s = N_("ext2");
- gchar *s = N_("reiserfs");
- gchar *s = N_("Swap");
- gchar *s = N_("fat32");
- gchar *s = N_("fat16");
gchar *s = N_("Partition Position:");
gchar *s = N_("When the partition doesn't fill up all the free space, you can choose to have it located at the beginning or the end of the free space");
--- 35,38 ----
***************
*** 47,56 ****
gchar *s = N_("End of free space");
gchar *s = N_("Partition Type:");
- gchar *s = N_("Partition Size");
- gchar *s = N_("Max Size:");
gchar *s = N_("Flags:");
gchar *s = N_("Makes the partition bootable on MS-DOS systems");
gchar *s = N_("Boot Partition");
! gchar *s = N_("Root Partition");
gchar *s = N_("Makes the partition hidden on Win32-based systems");
gchar *s = N_("Hidden Partition");
--- 40,51 ----
gchar *s = N_("End of free space");
gchar *s = N_("Partition Type:");
gchar *s = N_("Flags:");
gchar *s = N_("Makes the partition bootable on MS-DOS systems");
gchar *s = N_("Boot Partition");
! gchar *s = N_("Primary");
! gchar *s = N_("An Extended partition merely holds Logical partitions.");
! gchar *s = N_("Extended");
! gchar *s = N_("You can have any number of Logical partions inside an Extended partition.");
! gchar *s = N_("Logical");
gchar *s = N_("Makes the partition hidden on Win32-based systems");
gchar *s = N_("Hidden Partition");
***************
*** 61,69 ****
gchar *s = N_("Tell win32-based systems to use Linear (LBA) mode");
gchar *s = N_("LBA Partition");
! gchar *s = N_("Primary");
! gchar *s = N_("An Extended partition merely holds Logical partitions.");
! gchar *s = N_("Extended");
! gchar *s = N_("You can have any number of Logical partions inside an Extended partition.");
! gchar *s = N_("Logical");
gchar *s = N_("*");
gchar *s = N_("Resize Partition");
--- 56,61 ----
gchar *s = N_("Tell win32-based systems to use Linear (LBA) mode");
gchar *s = N_("LBA Partition");
! gchar *s = N_("Max Size:");
! gchar *s = N_("Partition Size");
gchar *s = N_("*");
gchar *s = N_("Resize Partition");
***************
*** 164,165 ****
--- 156,172 ----
gchar *s = N_("As a results of this error, the operation has been cancelled and no changes have been made.");
gchar *s = N_("Progress");
+ gchar *s = N_("Partition Morpher - Wizard mode");
+ gchar *s = N_("Welcome to the Partition Morpher Wizard\n"
+ "This tool will allow you to easily partition your harddisk\n"
+ "to let you install a new Linux distribution (ie. Morphix)");
+ gchar *s = N_("Detected Partition modes:");
+ gchar *s = N_("use all free space");
+ gchar *s = N_("You have enough free space available already to install Morphix without having to resize other partitions. \n"
+ "<b>This mode will not touch your existing data.</b>");
+ gchar *s = N_("resize other partitions");
+ gchar *s = N_("Attempt to resize your current partitions and use the occuring free space to create new Linux partitions for Morphix. If you have ntfs partitions you are advised to defragment these first in Windows(tm). \n"
+ "<b>You are advised to back up your data first!</b>");
+ gchar *s = N_("remove existing partitions");
+ gchar *s = N_("Remove all existing partitions on the selected harddisk and use all the resulting free space to create new Linux partitions for Morphix.\n"
+ "<b>THIS MODE WILL DELETE ALL YOUR EXISTING DATA!\n"
+ "YOU HAVE BEEN WARNED!</b>");
|
Update of /cvsroot/morphix/morphixinstaller/src
In directory sc8-pr-cvs1:/tmp/cvs-serv16615
Modified Files:
Makefile.am cmdline.c installer.h instlib.c instlib.h main.c
Added Files:
args.c args.h genlilo.c maincl.c
Log Message:
adapted installer to build the commandline version seperatly
beginnings of including genlilo into the installer
--- NEW FILE: args.c ---
/* Copyright (C) 2003 Alex de Landgraaf <ale...@xs...>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <glib.h>
#include <stdio.h>
#include <stdarg.h>
#include "args.h"
#include "installer.h"
void print_help() {
printf("Usage:\n morphixinstaller --debug | -d\n\t\tPrint debug messages\n\
morphixinstaller --root <path_to_rootpartitiondevice>\n\t\tUse the specified rootpartition\n\
morphixinstaller --swap <part_to_swappartitiondevice>\n\t\tUse the specified swappartition\n\
morphixinstaller --hdd <3-letter-harddiskdevice>\n\t\tUse the specified harddisk\n\
morphixinstaller --nopart\n\t\tDon't partition, go straight to rootpartition selector\n\
morphixinstaller --noswap\n\t\tDon't use swap at all, skip section\n\
morphixinstaller --part-with <path_to_application>\n\t\tWill execute the specified program instead of the default\n\
morphixinstaller --fstype <ext2|ext3|reiserfs|xfs>\n\t\tWill skip filesystemselection\n\
morphixinstaller --hostname <alfanumeric string>\n\t\tUse the specified hostname for installing\n\
morphixinstaller --rootpass <string>\n\t\tUse the specified string as password for the root user\n\
morphixinstaller --user <alfanumeric string> <string>\n\t\tUse the specified string as the username for the user being created, and the string after that for the user's password\n\
morphixinstaller --lilo-mbr\n\t\tUse the selected harddisk for installing lilo on\n\
morphixinstaller --lilo-root\n\t\tUse the selected rootpartition for installing lilo on\n\
morphixinstaller --nolilo\n\t\tDon't install lilo\n\
morphixinstaller --lilo-boot\n\t\tUse the selected bootpartition for installing lilo on\n\
morphixinstaller --ui [cmdline|gtk|auto]\n\t\tUse the selected installer UI. Auto works only with one harddisk, one Linux partition and one Swap partition. Defaults are ext3 for the fs, Morphix for the hostname, morphix for the root password and morph/morph for the username/password. Lilo will be installed to the mbr. You can specify different values by using one of the above arguments. If you don't: MAKE SURE TO CHANGE THE PASSWORDS AFTER INSTALLING! I won't answer any email from people being hacked because they havn't changed their passwords, it is at your own risk!\n\
\n\
You may use any combination of these arguments, note that the lilo-options override eachother, the last one counts\n\
\n\
morphixinstaller --help | -h\n\t\tPrints commandline arguments and exits\n\
\n\
For questions, bugs, feedback or lynching please contact me via www.morphix.org\n\
This program is licensed under the GNU GPL v2, copyright Alex de Landgraaf, 2003\n\n");
}
gboolean check_args(int *argcp, char ***argvp) {
gint i;
gint argc;
argc = *argcp;
gchar **argv;
argv = *argvp;
cmdlineargs.no_partitioning = FALSE;
cmdlineargs.no_swap_partition = FALSE;
cmdlineargs.swappart_set = FALSE;
cmdlineargs.rootpart_set = FALSE;
cmdlineargs.harddisk_set = FALSE;
cmdlineargs.partitioner_set = FALSE;
cmdlineargs.fs_set = FALSE;
cmdlineargs.hostname_set = FALSE;
cmdlineargs.rootpass_set = FALSE;
cmdlineargs.user_set = FALSE;
cmdlineargs.lilo_set = FALSE;
cmdlineargs.ui_set = FALSE;
cmdlineargs.ui_type = UI_GTK_TYPE;
if (argc == 1)
return TRUE;
/*
a dirty forloop-continue-return construction.
couldn't be bothered doing it proper, sorry :)
*/
for (i = 1; i < argc; i++) {
if (strcmp(argv[i],"--debug") == 0 ||
strcmp(argv[i],"-d") == 0) {
debug_switch = 1;
continue;
}
if (strcmp(argv[i],"--help") == 0 ||
strcmp(argv[i],"-h") == 0) {
return FALSE;
}
if (strcmp(argv[i],"--root") == 0) {
if (++i >= argc)
return FALSE;
if (strlen(argv[i]) >= 15 ||
!g_file_test(argv[i],G_FILE_TEST_EXISTS)) {
printf("Root argument too long or invalid\n");
return FALSE;
}
strcpy(cmdlineargs.rootpart,argv[i]);
cmdlineargs.rootpart_set = TRUE;
continue;
}
if (strcmp(argv[i],"--swap") == 0) {
if (++i >= argc)
return FALSE;
if (strlen(argv[i]) >= 15 ||
!g_file_test(argv[i],G_FILE_TEST_EXISTS)) {
printf("Swap argument too long or invalid\n");
return FALSE;
}
strcpy(cmdlineargs.swappart,argv[i]);
cmdlineargs.swappart_set = TRUE;
continue;
}
if (strcmp(argv[i],"--hdd") == 0) {
if (++i >= argc)
return FALSE;
if (strlen(argv[i]) != 3) {
printf("Hdd argument too long or invalid, needs to be 3 letters in length\n");
return FALSE;
}
strcpy(cmdlineargs.harddisk,argv[i]);
cmdlineargs.harddisk_set = TRUE;
continue;
}
if (strcmp(argv[i],"--nopart") == 0) {
cmdlineargs.no_partitioning = TRUE;
continue;
}
if (strcmp(argv[i],"--noswap") == 0) {
cmdlineargs.no_swap_partition = TRUE;
continue;
}
if (strcmp(argv[i],"--part-with") == 0) {
if (++i >= argc)
return FALSE;
if (strlen(argv[i]) >= 63 ||
!g_file_test(argv[i],G_FILE_TEST_EXISTS)) {
printf("Partitioner argument too long or invalid\n");
return FALSE;
}
strcpy(cmdlineargs.partitioner,argv[i]);
cmdlineargs.partitioner_set = TRUE;
continue;
}
if (strcmp(argv[i],"--fs") == 0) {
if (++i >= argc)
return FALSE;
if ((strcmp(argv[i],"ext2") == 0) || (strcmp(argv[i],"ext3") == 0) || (strcmp(argv[i],"reiserfs") == 0) || (strcmp(argv[i],"xfs") == 0)) {
strcpy(cmdlineargs.fs,argv[i]);
} else {
printf("fs argument invalid\n");
return FALSE;
}
cmdlineargs.fs_set = TRUE;
continue;
}
if (strcmp(argv[i],"--hostname") == 0) {
if (++i >= argc)
return FALSE;
if (strlen(argv[i]) >= 63) {
printf("hostname argument too long or invalid\n");
return FALSE;
}
gint j;
for (j = 0; j < strlen(argv[i]); j++) {
if (!g_ascii_isalnum(argv[i][j])) {
printf("hostname argument contains invalid char\n");
return FALSE;
}
}
strcpy(cmdlineargs.hostname,argv[i]);
cmdlineargs.hostname_set = TRUE;
continue;
}
if (strcmp(argv[i],"--rootpass") == 0) {
if (++i >= argc)
return FALSE;
if (strlen(argv[i]) >= 63) {
printf("rootpass argument too long or invalid\n");
return FALSE;
}
gint j;
for (j = 0; j < strlen(argv[i]); j++) {
if (!g_ascii_isalnum(argv[i][j])) {
printf("rootpass argument contains invalid char\n");
return FALSE;
}
}
strcpy(cmdlineargs.rootpass,argv[i]);
cmdlineargs.rootpass_set = TRUE;
continue;
}
if (strcmp(argv[i],"--user") == 0) {
if (++i >= argc) {
printf("Need username and password\n");
return FALSE;
}
if (strlen(argv[i]) >= 63) {
printf("username argument too long or invalid\n");
return FALSE;
}
gint j;
for (j = 0; j < strlen(argv[i]); j++) {
if (!g_ascii_isalnum(argv[i][j])) {
printf("username argument contains invalid char\n");
return FALSE;
}
}
strcpy(cmdlineargs.username,argv[i]);
if (++i >= argc) {
printf("Need username and password\n");
return FALSE;
}
if (strlen(argv[i]) >= 63) {
printf("password argument too long or invalid\n");
return FALSE;
}
for (j = 0; j < strlen(argv[i]); j++) {
if (!g_ascii_isalnum(argv[i][j])) {
printf("password argument contains invalid char\n");
return FALSE;
}
}
strcpy(cmdlineargs.userpass,argv[i]);
cmdlineargs.user_set = TRUE;
continue;
}
if (strcmp(argv[i],"--lilo-mbr") == 0) {
/*
lilo_mode:
1 - use selected_harddisk MBR
2 - use selected rootpartition
3 - don't use lilo
4 - use selected bootpartition
*/
cmdlineargs.lilo_type = 1;
cmdlineargs.lilo_set = TRUE;
continue;
}
if (strcmp(argv[i],"--lilo-root") == 0) {
cmdlineargs.lilo_type = 2;
cmdlineargs.lilo_set = TRUE;
continue;
}
if (strcmp(argv[i],"--nolilo") == 0) {
cmdlineargs.lilo_type = 3;
cmdlineargs.lilo_set = TRUE;
continue;
}
if (strcmp(argv[i],"--lilo-boot") == 0) {
cmdlineargs.lilo_type = 4;
cmdlineargs.lilo_set = TRUE;
continue;
}
if (strcmp(argv[i],"--ui") == 0) {
if (++i >= argc)
return FALSE;
if (strcmp(argv[i],"cmdline") == 0) {
cmdlineargs.ui_type = UI_CMDLINE_TYPE;
cmdlineargs.ui_set = TRUE;
continue;
}
if (strcmp(argv[i],"gtk") == 0) {
cmdlineargs.ui_type = UI_GTK_TYPE;
cmdlineargs.ui_set = TRUE;
continue;
}
if (strcmp(argv[i],"auto") == 0) {
cmdlineargs.ui_type = UI_AUTO_TYPE;
cmdlineargs.ui_set = TRUE;
continue;
}
}
return FALSE;
}
}
--- NEW FILE: args.h ---
#ifndef ARGS_H
#define ARGS_H
void print_help();
gboolean check_args(int *argcp, char ***argvp);
#endif // ARGS_H
--- NEW FILE: genlilo.c ---
/*
copied from genliloconf in Knoppix for integration into the morphix installer
could use this to easily generate grub stuff too. Hope to clean this up a bit,
maybe make a seperate library for inclusion into the installer, for now it'll
stay a standalone application
*/
#define BC_LILO_CONF "lilo.conf.template"
#define BC_RUN_LILO "echo pretend running lilo..."
#define APPEND_OPTS "vga=extended"
#include <stdio.h>
#include <assert.h>
#include <ctype.h>
#include <string.h>
#include <stdio.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/mount.h>
//#include <linux/fdreg.h>
//#include <linux/fd.h>
#include "../libfdisk/fdisk.h"
#include <stdlib.h>
#include <dirent.h>
#include <syscall.h>
#define DEV_HDA "/dev/hda"
#define DEV_I2O_HDA "/dev/i2o/hda"
#define DEV_SDA "/dev/sda"
#define DEV_RD_C0D0 "/dev/rd/c0d0"
#define DEV_IDA_C0D0 "/dev/ida/c0d0"
#define DEV_CCISS_C0D0 "/dev/cciss/c0d0"
#define DEV_ATARAID_D0 "/dev/ataraid/d0"
struct d_choices
{
char* tag;
char* string;
int state;
};
struct fdisk_partition *Boot;
#define PRTBUFSIZE 3364 /* (ceil(log2(80*43)))^2 */
char prtbuf[PRTBUFSIZE];
char *first_ide_disk(void);
char *append_opts, *image, *root;
struct fdisk_partition *test;
char *initrd=NULL;
inline int
is_filesystem_supported(const char *fstype)
{
return (syscall(__NR_sysfs, 1, fstype) < 0);
}
#define BC_LILOTEMPLATE1 \
"# /etc/lilo.conf - See: `lilo(8)' and `lilo.conf(5)',\n" \
"# --------------- `install-mbr(8)', `/usr/share/doc/lilo/',\n" \
"# and `/usr/share/doc/mbr/'.\n" \
"\n" \
"# +---------------------------------------------------------------+\n" \
"# | !! Reminder !! |\n" \
"# | |\n" \
"# | Don't forget to run `lilo' after you make changes to this |\n" \
"# | conffile, `/boot/bootmess.txt', or install a new kernel. The |\n" \
"# | computer will most likely fail to boot if a kernel-image |\n" \
"# | post-install script or you don't remember to run `lilo'. |\n" \
"# | |\n" \
"# +---------------------------------------------------------------+\n" \
"\n" \
"# Support LBA for large hard disks.\n" \
"#\n" \
"lba32\n" \
"\n" \
"# Overrides the default mapping between harddisk names and the BIOS'\n" \
"# harddisk order. Use with caution.\n" \
"%s\n%s\n" \
"# Specifies the boot device. This is where Lilo installs its boot\n" \
"# block. It can be either a partition, or the raw device, in which\n" \
"# case it installs in the MBR, and will overwrite the current MBR.\n" \
"#\n" \
"boot=%s\n" \
"\n" \
"# Specifies the device that should be mounted as root. (`/')\n" \
"#\n" \
"root=%s\n" \
"\n" \
"# Enable map compaction:\n" \
"# Tries to merge read requests for adjacent sectors into a single\n" \
"# read request. This drastically reduces load time and keeps the\n" \
"# map smaller. Using `compact' is especially recommended when\n" \
"# booting from a floppy disk. It is disabled here by default\n" \
"# because it doesn't always work.\n" \
"#\n" \
"# compact\n" \
"\n" \
"# Installs the specified file as the new boot sector\n" \
"# You have the choice between: bmp, compat, menu and text\n" \
"# Look in /boot/ and in lilo.conf(5) manpage for details\n" \
"#\n" \
"install=/boot/boot-menu.b\n" \
"\n" \
"# Specifies the location of the map file\n" \
"#\n" \
"map=/boot/map\n" \
"\n" \
"# You can set a password here, and uncomment the `restricted' lines\n" \
"# in the image definitions below to make it so that a password must\n" \
"# be typed to boot anything but a default configuration. If a\n" \
"# command line is given, other than one specified by an `append'\n" \
"# statement in `lilo.conf', the password will be required, but a\n" \
"# standard default boot will not require one.\n" \
"#\n" \
"# This will, for instance, prevent anyone with access to the\n" \
"# console from booting with something like `Linux init=/bin/sh',\n" \
"# and thus becoming `root' without proper authorization.\n" \
"#\n" \
"# Note that if you really need this type of security, you will\n" \
"# likely also want to use `install-mbr' to reconfigure the MBR\n" \
"# program, as well as set up your BIOS to disallow booting from\n" \
"# removable disk or CD-ROM, then put a password on getting into the\n" \
"# BIOS configuration as well. Please RTFM `install-mbr(8)'.\n" \
"#\n" \
"# password=tatercounter2000\n" \
"\n" \
"# Specifies the number of deciseconds (0.1 seconds) LILO should\n" \
"# wait before booting the first image.\n" \
"#\n" \
"delay=20\n" \
"\n" \
"# You can put a customized boot message up if you like. If you use\n" \
"# `prompt', and this computer may need to reboot unattended, you\n" \
"# must specify a `timeout', or it will sit there forever waiting\n" \
"# for a keypress. `single-key' goes with the `alias' lines in the\n" \
"# `image' configurations below. eg: You can press `1' to boot\n" \
"# `Linux', `2' to boot `LinuxOLD', if you uncomment the `alias'.\n" \
"#\n" \
"# message=/boot/bootmess.txt\n" \
"%s" \
"# prompt\n" \
"# single-key\n" \
"# delay=100\n" \
"# timeout=100\n" \
"\n" \
"# Kernel command line options that apply to all installed images go\n" \
"# here. See: The `boot-prompt-HOWO' and `kernel-parameters.txt' in\n" \
"# the Linux kernel `Documentation' directory.\n" \
"#\n" \
"# append=\"\"\n" \
"%s\n" \
"# Boot up Linux by default.\n" \
"#\n" \
"default=Linux\n" \
"\n" \
"image=%s\n" \
" label=Linux\n" \
" %s\n"
#define BC_LILOTEMPLATE3 \
" read-only\n" \
"# restricted\n" \
"# alias=1\n" \
"\n" \
"image=/vmlinuz.old\n" \
" label=LinuxOLD\n" \
" read-only\n" \
" optional\n" \
"# restricted\n" \
"# alias=2\n" \
"\n" \
"# If you have another OS on this machine to boot, you can uncomment the\n" \
"# following lines, changing the device name on the `other' line to\n" \
"# where your other OS' partition is.\n" \
"#\n" \
"# other=/dev/hda4\n" \
"# label=HURD\n" \
"# restricted\n" \
"# alias=3\n"
static int run_lilo(char *boot, int fixmap, struct d_choices *others, int o_number)
{
FILE* filep;
int status = 0, i=0;
#ifndef _TESTING_
struct stat statbuf;
char * size;
/* files that we need */
char *files[]={
"/sbin/insmod",
"/bin/sh",
"/bin/mount",
"/bin/umount",
"/lib/ld-linux.so.2",
"/lib/libc.so.6",
"" /* we use the NULL string to find the end */
};
#endif
char *append, *prompt="";
char * bootpart_map;
char * boot_map;
/*
if ((filep = fopen(BC_LILO_CONF, "w")) == NULL) {
#ifdef _TESTING_
fprintf(stderr, "Cannot open %s: %s\n", BC_LILO_CONF, strerror(errno));
sleep(2);
#endif
return 1;
}
*/
filep = stdout;
/* shouldn't be possible for name to be blank, but would explain Bug #53807 */
// assert(Root->name && Root->name[0]);
// assert(boot && boot[0]);
boot_map = calloc(1, 32);
bootpart_map = calloc(1, 32);
if(fixmap==1) {
/* harddisk with Boot's location */
char * bootpart_dev = (char *) strndup(Boot->name, 8);
/* okay, setting real int13 values for the root and boot devices */
sprintf(boot_map,"disk=%s\nbios=0x80\n", first_ide_disk());
/* if /boot is elsewhere, map it too */
/* if(strcmp(bootpart_dev, first_ide_disk()) != 0)
sprintf(bootpart_map,"disk=%s\nbios=0x%i\n", bootpart_dev, *(bootpart_dev+7) - *(boot+7) + 80);
*/
}
else {
bootpart_map = "#disk=/dev/sda\n# bios=0x80\n";
boot_map = "#disk=/dev/hde\n# bios=0x81\n";
}
INFOMSG("writing lilo.conf with boot of '%s' and root of '%s'%s",
boot, root, fixmap ? " and device mapping" : "");
if(o_number > 0)
prompt = "prompt\ntimeout=150\n";
else
prompt = "";
if (append_opts && strlen (append_opts)) {
append = (char *)malloc (strlen (append_opts) + 1 + 10); /* "append=\"" + "\"\n"*/
sprintf (append, "append=\"%s\"\n", append_opts);
fprintf(filep, BC_LILOTEMPLATE1, boot_map, bootpart_map, boot, root, prompt, append, image, initrd ? initrd : "");
free (append);
} else {
fprintf(filep, BC_LILOTEMPLATE1, boot_map, bootpart_map, boot, root, prompt, "", image, initrd ? initrd : "" );
}
fprintf(filep, BC_LILOTEMPLATE3);
for(i=0; i < o_number; i++) {
fprintf(filep, "other=%s\n label=\"%s(%s)\"\n\n", others[i].tag, others[i].string, strrchr(others[i].tag, '/')+1);
}
fclose(filep);
chmod(BC_LILO_CONF, 0640);
/*#if !defined _TESTING_
status = execlog(BC_RUN_LILO, LOG_INFO);
#endif*/
return status;
}
/* part_disk_name: return name of partition's disk device, if available */
char *part_disk_name(struct fdisk_partition *part)
{
return (part->disk ? part->disk->name : NULL);
}
/* is_first_scsi: return true if partition is on the first SCSI disk */
int is_first_scsi(struct fdisk_partition *part)
{
char *dname = part_disk_name(part);
return dname && (strcmp(dname, DEV_SDA) == 0 ||
strcmp(dname, DEV_RD_C0D0) == 0 ||
strcmp(dname, DEV_CCISS_C0D0) == 0 ||
strcmp(dname, DEV_IDA_C0D0) == 0 ||
strcmp(dname, DEV_I2O_HDA) == 0 ||
strcmp(dname, DEV_ATARAID_D0) == 0);
}
/* is_first_ide: return true if partition is on the first IDE disk */
int is_first_ide(struct fdisk_partition *part)
{
char *dname = part_disk_name(part); //FIXME - check how ide vs. scsi is handled
return dname && strcmp(dname, DEV_HDA) == 0;
}
/* is_logical_part: return true if partition is an MS-DOS logical partition */
int is_logical_part(struct fdisk_partition *part)
{
if (part->disk && strcmp(part->disk->partition_format, "msdos") == 0) {
char *s, *t;
assert(*part->name);
/* find the first digit in the part->name, set t to the rest of the string */
for (s = part->name, t = NULL; *s; s++) {
if (isdigit(*s)) {
t = s;
break;
}
}
if (t) {
assert(strlen(t) <= 5);
return(atoi(t) > 4);
}
}
return 0;
}
/* !!!! strlen and sizeof are not the same thing. Please don't change this
* again !!!!!! -randolph
*/
/* is_ide: returns true if partition is on an IDE disk */
int is_ide(char *name)
{
// printf("%s\n",name);
return strncmp(name, DEV_HDA, strlen(DEV_HDA) - 1) == 0;
// printf("%s, %s, %d, hm...", name, DEV_HDA, strlen(DEV_HDA));
}
/* is_scsi: returns true if partition is on a SCSI disk */
int is_scsi(char *name)
{
return strncmp(name, DEV_SDA, strlen(DEV_SDA) - 1) == 0;
}
/* is_i2o_scsi: returns true if partition is on a i2o-SCSI disk */
int is_scsii2o(char *name)
{
return strncmp(name, DEV_I2O_HDA, strlen(DEV_I2O_HDA) - 1) == 0;
}
/* is_scsird: returns true if partition is on a SCSI disk (/dev/rd/c*) */
int is_scsird(char *name)
{
return strncmp(name, DEV_RD_C0D0, strlen(DEV_RD_C0D0) - 3) == 0;
}
/* is_scsiida: returns true if partition is on a SCSI disk (/dev/rd/c*) */
int is_scsiida(char *name)
{
return strncmp(name, DEV_IDA_C0D0, strlen(DEV_IDA_C0D0) - 3) == 0;
}
/* is_scsicciss: returns true if partition is on a CCISS disk (/dev/cciss/c*) */
int is_scsicciss(char *name)
{
return strncmp(name, DEV_CCISS_C0D0, strlen(DEV_CCISS_C0D0) - 3) == 0;
}
/* is_ataraid: returns true if partition is on a SCSI disk (/dev/ataraid/d*) */
int is_ataraid(char *name)
{
return strncmp(name, DEV_ATARAID_D0, strlen(DEV_ATARAID_D0) - 3) == 0;
}
/* Return a string containing the name of the first existing IDE disk. */
char *first_ide_disk(void) {
static char disk[] = "/dev/hda";
for (; disk[strlen(disk) - 1] < 'l'; (disk[strlen(disk) - 1])++)
if (fdisk_find_disk(disk) != NULL)
return disk;
return NULL;
}
/* Return a string containing the name of the first existing SCSI disk. */
char *first_scsi_disk(void)
{
static char disk[] = "/dev/sda";
for (; disk[strlen(disk) - 1] < 'l'; (disk[strlen(disk) - 1])++)
if (fdisk_find_disk(disk) != NULL)
return disk;
return NULL;
}
int
is_fstype (const char *mount, const char *fs)
{
FILE *proc;
int match=0;
char dev[80], dir[80], type[80];
proc = fopen ("/proc/mounts", "r");
if ( proc == NULL )
{
// perrorBox(_("Can't read /proc/mounts"));
return -1;
}
while ( EOF != fscanf (proc, "%s %s %s %*s %*i %*i\n",
dev, dir, type))
{
if (!strncmp (mount, dev, 79))
{
match = strncmp (fs, type, 79) ? 0 : 1;
break;
}
if (!strncmp (mount, dir, 79))
{
match = strncmp (fs, type, 79) ? 0 : 1;
break;
}
}
fclose (proc);
return match;
}
int main(int argc, char *argv[]) {
#define ARGMAX 6
int installed_mbr = 0, fix_mapping = 0;
char *device = "";
struct d_choices opt[2];
struct stat statbuf;
int res;
struct d_choices *bootable = NULL;
int boot_number=0;
char *boot="";
boot = argv[1];
if(argc<ARGMAX-1)
{
fprintf(stderr, "Usage: genliloconf BootDeviceOrMBR RootDevice AppendOpts KernelImage [miscOptions] \n"
"Purpose: generate a lilo.conf.template file scanning all partitions\n"
"and putting the bootable into the lilo menu.\n"
"miscOptions are added to the primary boot image profile, eg.:\n"
"initrd=/path/to/the/initrd-image\n");
return 255;
}
fdisk_reread();
root = argv[2];
append_opts=argv[3];
image = argv[4];
if(argc=(ARGMAX)) initrd = argv[ARGMAX-1];
/* set device to what we think is the boot disk */
if (is_ide(boot)) device = first_ide_disk ();
else if (is_scsi(boot)) device = DEV_SDA;
else if (is_scsird(boot)) device = DEV_RD_C0D0;
else if (is_scsiida(boot)) device = DEV_IDA_C0D0;
else if (is_scsii2o(boot)) device = DEV_I2O_HDA;
else if (is_scsicciss(boot)) device = DEV_CCISS_C0D0;
else if (is_ataraid(boot)) device = DEV_ATARAID_D0;
else {
/*device = inputBox(_("The attempt to deduce what your boot disk is failed. "
"Please enter the name of your boot disk, for instance, "
"'/dev/hda' or '/dev/sda'."),
_("Choose Boot Disk"), DEV_HDA);
if (! NAME_ISBLK(device, &statbuf) ) {
vaproblemBox(_("Invalid Boot Disk"),
_("There is no block device '%s'."), device);*/
return 1;
// }
}
//printf("fuck, was ist hier los: %s\n", boot);
//return 1;
/* XFS stores the superblock in the very first block of the
filesystem. This means that installing LILO on a partition
containing an XFS superblock will destroy the filesystem. So we
can only install onto the MBR on ia32 systems when we're using
XFS. */
/* if (is_xfs) {
boot = device;
installed_mbr = 1;
};* else {
opt[0].tag = device;
opt[0].string = _("Install LILO in the MBR (use this if unsure).");
opt[1].tag = Boot->name;
opt[1].string = _("Install LILO in the boot partition's boot sector.");
if (Boot == Root)
opt[1].string = _("Install LILO in the root partition's boot sector.");
snprintf(prtbuf, sizeof(prtbuf), _("LILO can be installed either into the master boot record (MBR), or into the %s boot block. If installed into the MBR, LILO will take control of the boot process. If you choose not to install LILO into the MBR, you will have the opportunity later on to install an alternative MBR program (for bootstrapping LILO).\n"),
Boot->name);
if ((res = menuBox(prtbuf, _("Where should the LILO boot loader be installed?"), opt, 2, 1)) == -1)
return 0;
//boot = opt[res].tag;
installed_mbr = (res == 0);
}*/
if (! NAME_ISBLK(boot, &statbuf) ) {
fprintf(stderr,_("Invalid Boot Disk"),
_("There is no block device '%s'. You need to try this step again "
"with different choices, or perhaps make the device by hand."),
boot);
return 1;
}
/* if there is no SCSI hd, no /dev/hda disk, but another IDE harddisks,
* this looks like the typical bios-mapping situation. Workaround... */
/* But do not do this on ATARAID, there we should trust lilo */
sprintf(prtbuf, _("Your first IDE harddisk is not connected as the primary master device (/dev/hda). To get around this, most BIOS setups enable emulation so that the first disk is seen as IDE-0 in the boot environment. This emulation cannot be detected by Linux or LILO. However, we can define %s as the first hard disk in the lilo configuration to allow LILO to take advantage of the emulation. If you think your BIOS works this way or if you installed boot management software to enable this emulation, you probably want to say yes. Would you like to enable this mapping?\n\n"), first_ide_disk());
if( (first_scsi_disk() == NULL) &&
(first_ide_disk() != NULL) &&
(strcmp(first_ide_disk(), DEV_HDA) != 0) &&
(!is_ataraid(boot)) /*&&
( yesNoBox(prtbuf, _("Virtual IDE device mapping")) ) */
)
{
fix_mapping=1;
goto idemapped;
}
fix_mapping=0;
idemapped:
/* check for booting from SCSI but we also have /dev/hda
if ( is_first_scsi(Boot) && fdisk_find_disk(DEV_HDA) &&
! yesNoBox(_("With your current configuration, LILO will try to boot "
"from your first SCSI disk, but your system also has a "
"master IDE disk at the primary IDE controller. "
"It's possible that your BIOS doesn't support that.\n\n"
"Do you want to install the MBR anyway?"), _("Problem")) ) {
return 1;
}
*/
/* screen is sometimes not cleared, forcing */
// newtCls();
/* begin other-detection */
if(fdisk_partitions != NULL) {
struct fdisk_partition *testpart = fdisk_partitions;
char bootmagic[2];
FILE *fd;
bootable = (struct d_choices *) malloc(20*sizeof(struct d_choices));
boot_number=0;
while(testpart) {
// printf("teste: %s\n", testpart->name);
bzero(bootmagic, 2);
if( (!strcmp(testpart->name, root)) || testpart->type == 0x05 ||testpart->type == 0x0f)
goto nextone; // skip Root, skip extended partitions
fd = fopen(testpart->name, "r");
if (!fd)
goto nextone;
fseek (fd, 510, SEEK_SET);
fread (bootmagic, 1, 2, fd);
if(!strncmp(bootmagic, "U\252", 2)) {
/* we have one */
char *type;
fprintf(stderr, "part: %s, typ: %i\n", testpart->name, testpart->type);
switch (testpart->type) {
case 0x83:
type = "Linux";
break;
case 0x41:
case 0x81:
type = "Minix";
break;
case 0x07:
type = "WinNT";
break;
case 0x0c:
case 0x0b:
type = "Windows";
break;
case 0x06:
case 0x04:
type = "Win/DOS";
break;
case 0x01:
type = "DOS";
break;
default:
type = "Other";
}
bootable[boot_number].tag = testpart->name;
bootable[boot_number].state = 0;
bootable[boot_number++].string = type; //FIXME
}
fclose(fd);
nextone:
testpart = testpart->next;
}
/*
if(boot_number) {
int status;
struct d_choices options[3];
options[0].tag = _("Include");
options[0].state = 0;
options[0].string = _("Put all into the menu");
options[1].tag = _("View");
options[1].state = 0;
options[1].string = _("Show the list of bootable partitions");
options[2].tag = _("Ignore");
options[2].state = 0;
options[2].string = _("Do not include any other partition");
redisplay_options:
status = menuBox(_("LILO setup discovered boot signatures on other partitions in your system. If you installed other operating systems on this machine, you may want to include them in the boot menu. Please choose how to handle them: "), _("Other bootable partitions"), options, 3, 0);
switch (status) {
case 0:
break;
case 1:
{
char * buf;
int i;
buf = (char *) calloc (boot_number, 50);
for(i=0; i< boot_number; i++) {
strcat(buf, "\t");
strcat(buf, bootable[i].tag);
strcat(buf, "(");
strcat(buf, bootable[i].string);
strcat(buf, ")\n");
}
sprintf(prtbuf, _("The following partitions seem to be bootable and would be added to the boot menu:\n\n%s"), buf);
problemBox(prtbuf, _("Other bootable partitions"));
free(buf);
}
goto redisplay_options;
case 2:
boot_number=0;
break;
default:
boot_number=0;
return 1; /* Cancelled, failed, whatever
}
}*/
}
return run_lilo(boot, fix_mapping, bootable, boot_number);
}
--- NEW FILE: maincl.c ---
/* Copyright (C) 2003 Alex de Landgraaf <ale...@xs...>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <glib.h>
#include <stdio.h>
#include <stdarg.h>
#include "installer.h"
#include "instlib.h"
#include "cmdline.h"
#include "args.h"
int debug(const char *fmt, ...) {
int d;
va_list args;
va_start(args, fmt);
if (debug_switch == 1) {
d = vfprintf(stdout,fmt,args);
va_end(args);
return d;
}
va_end(args);
return 0;
}
int
main (int argc, char *argv[])
{
int cmdline = 0;
debug_switch = 0;
if (!check_args(&argc, &argv)) {
print_help();
return 1;
}
if (cmdlineargs.ui_set == TRUE && cmdlineargs.ui_type == UI_AUTO_TYPE) {
/* Auto works only when root, swap, hdd, nopart, fstype, hostname, rootpass, user, and a lilo option are set. If not, you will need to supply input (for now) */
if (cmdlineargs.harddisk_set == FALSE ||
cmdlineargs.no_partitioning == FALSE ||
cmdlineargs.hostname_set == FALSE ||
cmdlineargs.rootpass_set == FALSE ||
cmdlineargs.user_set == FALSE ||
cmdlineargs.lilo_set == FALSE) {
printf("Auto install doesn't have the necessary commandline arguments\n");
print_help();
return 1;
}
}
StoreKernelVersion();
start_cmdline_iface();
return 0;
}
Index: Makefile.am
===================================================================
RCS file: /cvsroot/morphix/morphixinstaller/src/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.am 19 Sep 2003 14:34:25 -0000 1.5
--- Makefile.am 7 Jan 2004 23:12:46 -0000 1.6
***************
*** 6,10 ****
@PACKAGE_CFLAGS@
! bin_PROGRAMS = morphixinstaller
morphixinstaller_SOURCES = \
--- 6,20 ----
@PACKAGE_CFLAGS@
! bin_PROGRAMS = morphixinstaller morphixinstallercl genliloconf
!
! genliloconf_SOURCES = \
! genlilo.c
!
! morphixinstallercl_SOURCES = \
! maincl.c \
! cmdline.c cmdline.h \
! installer.h \
! args.c args.h \
! instlib.h instlib.c
morphixinstaller_SOURCES = \
***************
*** 13,18 ****
interface.c interface.h \
callbacks.c callbacks.h \
installer.h instlib.c instlib.h \
! cmdline.h cmdline.c
morphixinstaller_LDFLAGS = -pthread
--- 23,36 ----
interface.c interface.h \
callbacks.c callbacks.h \
+ args.c args.h \
installer.h instlib.c instlib.h \
! cmdline.h cmdline.c
!
! genliloconf_LDADD = @PACKAGE_LIBS@ $(INTLLIBS)
!
! morphixinstallercl_LDFLAGS = -pthread
!
! morphixinstallercl_LDADD = @PACKAGE_LIBS@ -lcrypt -lgthread-2.0 -lglib-2.0 $(INTLLIBS)
!
morphixinstaller_LDFLAGS = -pthread
Index: cmdline.c
===================================================================
RCS file: /cvsroot/morphix/morphixinstaller/src/cmdline.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cmdline.c 26 Oct 2003 22:56:18 -0000 1.2
--- cmdline.c 7 Jan 2004 23:12:46 -0000 1.3
***************
*** 7,11 ****
#endif
! #include <gtk/gtk.h>
gchar *ask_harddisk() {
--- 7,11 ----
#endif
! #include <glib.h>
gchar *ask_harddisk() {
Index: installer.h
===================================================================
RCS file: /cvsroot/morphix/morphixinstaller/src/installer.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** installer.h 26 Oct 2003 22:56:18 -0000 1.7
--- installer.h 7 Jan 2004 23:12:46 -0000 1.8
***************
*** 15,27 ****
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
! #ifndef MORPHIX_INSTALLER_H
! #define MORPHIX_INSTALLER_H
! #define INSTALLER_VERSION 0.01
! #define FS_MINIMUM 350
! #define SWAP_MINIMUM 32
- #define TEMPLATE_FILENAME "knx-templates-0.37.tgz"
#define ROOT_MOUNTPOINT "/mnt/target"
#define LOOP_MOUNTPOINT_1 "/tmp/l1"
--- 15,28 ----
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
! #ifndef INSTALLER_H
! #define INSTALLER_H
! // #define INSTALLER_VERSION 0.1
! // #define FS_MINIMUM 350
! // #define SWAP_MINIMUM 32
!
! // #define TEMPLATE_FILENAME "knx-templates-0.37.tgz"
#define ROOT_MOUNTPOINT "/mnt/target"
#define LOOP_MOUNTPOINT_1 "/tmp/l1"
***************
*** 32,41 ****
#define TMP_FILENAME "/tmp/hdinst.tmp"
! #include <gtk/gtk.h>
gint debug_switch;
#define UI_CMDLINE_TYPE 0
#define UI_GTK_TYPE 1
#define UI_AUTO_TYPE 2
struct cmdlineargs_struct {
gchar rootpart[16];
--- 33,46 ----
#define TMP_FILENAME "/tmp/hdinst.tmp"
! #include <glib.h>
gint debug_switch;
+
+ /* Ability for cli/gui switching disabled */
#define UI_CMDLINE_TYPE 0
#define UI_GTK_TYPE 1
#define UI_AUTO_TYPE 2
+
+ /* Save all options given on the commandline */
struct cmdlineargs_struct {
gchar rootpart[16];
***************
*** 65,74 ****
gint lilo_type;
} cmdlineargs;
-
-
! void StoreKernelVersion();
! gboolean CheckRoot();
! void ShowError();
int debug(const char *fmt, ...);
#endif
--- 70,76 ----
gint lilo_type;
} cmdlineargs;
! /* simple printf-replacement */
int debug(const char *fmt, ...);
+
#endif
Index: instlib.c
===================================================================
RCS file: /cvsroot/morphix/morphixinstaller/src/instlib.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** instlib.c 26 Oct 2003 22:56:18 -0000 1.9
--- instlib.c 7 Jan 2004 23:12:46 -0000 1.10
***************
*** 795,799 ****
*/
! void SetupLilo(gint lilo_mode) {
// lilo.conf shouldn't be hardcoded to executable
gchar lilo_conf[4092];
--- 795,799 ----
*/
! gboolean SetupLilo(gint lilo_mode) {
// lilo.conf shouldn't be hardcoded to executable
gchar lilo_conf[4092];
***************
*** 806,810 ****
if (lilo_mode == 3) {
/* lilo won't be used, return */
! return;
}
/* Install LILO
--- 806,810 ----
if (lilo_mode == 3) {
/* lilo won't be used, return */
! return TRUE;
}
/* Install LILO
***************
*** 864,869 ****
debug("Exec: %s\n",cmdline);
if (g_spawn_command_line_sync(cmdline,&outbuffer,NULL,&exitstatus,NULL) == FALSE) {
! debug("Error occured executing command\n");
! ShowError(outbuffer);
}
sprintf(cmdline,"%s/etc/lilo.conf",ROOT_MOUNTPOINT);
--- 864,870 ----
debug("Exec: %s\n",cmdline);
if (g_spawn_command_line_sync(cmdline,&outbuffer,NULL,&exitstatus,NULL) == FALSE) {
! debug("Error occured executing command:\n");
! debug(outbuffer);
! debug("\n");
}
sprintf(cmdline,"%s/etc/lilo.conf",ROOT_MOUNTPOINT);
***************
*** 1030,1033 ****
--- 1031,1035 ----
sprintf(cmdline,"lilo -r %s",ROOT_MOUNTPOINT);
ExecuteCommand(cmdline);
+ return TRUE;
}
***************
*** 1040,1044 ****
/* sprintf(cmdline,"%s/etc/inittab",ROOT_MOUNTPOINT);
file =fopen(cmdline,"a");
! // standart Debian inittab already contains this stuff
// add getty's so each console has it's login prompt
fprintf(file,"2:2345:respawn:/sbin/getty 38400 tty2\n");
--- 1042,1046 ----
/* sprintf(cmdline,"%s/etc/inittab",ROOT_MOUNTPOINT);
file =fopen(cmdline,"a");
! // standard Debian inittab already contains this stuff
// add getty's so each console has it's login prompt
fprintf(file,"2:2345:respawn:/sbin/getty 38400 tty2\n");
***************
*** 1125,1130 ****
}
if (g_spawn_command_line_sync(cmdline,&outbuffer,NULL,&exitstatus,NULL) == FALSE) {
! debug("Error occured executing command\n");
! ShowError(outbuffer);
}
sprintf(cmdline,"%s/etc/lilo.conf",ROOT_MOUNTPOINT);
--- 1127,1133 ----
}
if (g_spawn_command_line_sync(cmdline,&outbuffer,NULL,&exitstatus,NULL) == FALSE) {
! debug("Error occured executing command:\n");
! debug(outbuffer);
! debug("\n");
}
sprintf(cmdline,"%s/etc/lilo.conf",ROOT_MOUNTPOINT);
***************
*** 1144,1148 ****
sprintf(cmdline,"cp /tmp/lilo.conf %s/etc/lilo.conf",ROOT_MOUNTPOINT);
ExecuteCommand(cmdline);
!
}
--- 1147,1151 ----
sprintf(cmdline,"cp /tmp/lilo.conf %s/etc/lilo.conf",ROOT_MOUNTPOINT);
ExecuteCommand(cmdline);
! return TRUE;
}
Index: instlib.h
===================================================================
RCS file: /cvsroot/morphix/morphixinstaller/src/instlib.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** instlib.h 24 Sep 2003 23:23:03 -0000 1.4
--- instlib.h 7 Jan 2004 23:12:46 -0000 1.5
***************
*** 1,6 ****
! #ifndef INSTALLER_INSTLIB_H
! #define INSTALLER_INSTLIB_H
! #include <gtk/gtk.h>
#define REAL_INSTALL
--- 1,6 ----
! #ifndef INSTLIB_H
! #define INSTLIB_H
! #include <glib.h>
#define REAL_INSTALL
***************
*** 173,177 ****
*/
! void SetupLilo(gint lilo_mode);
/*
--- 173,177 ----
*/
! gboolean SetupLilo(gint lilo_mode);
/*
Index: main.c
===================================================================
RCS file: /cvsroot/morphix/morphixinstaller/src/main.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** main.c 22 Aug 2003 22:25:23 -0000 1.7
--- main.c 7 Jan 2004 23:12:46 -0000 1.8
***************
*** 22,25 ****
--- 22,26 ----
#include <stdio.h>
#include <stdarg.h>
+ #include "args.h"
#include "interface.h"
#include "support.h"
***************
*** 47,303 ****
GtkWidget *HelpDialog;
GtkWidget *SelectPartExpert;
-
- void print_help() {
- printf("Usage:\n morphixinstaller --debug | -d\n\t\tPrint debug messages\n\
- morphixinstaller --root <path_to_rootpartitiondevice>\n\t\tUse the specified rootpartition\n\
- morphixinstaller --swap <part_to_swappartitiondevice>\n\t\tUse the specified swappartition\n\
- morphixinstaller --hdd <3-letter-harddiskdevice>\n\t\tUse the specified harddisk\n\
- morphixinstaller --nopart\n\t\tDon't partition, go straight to rootpartition selector\n\
- morphixinstaller --noswap\n\t\tDon't use swap at all, skip section\n\
- morphixinstaller --part-with <path_to_application>\n\t\tWill execute the specified program instead of the default\n\
- morphixinstaller --fstype <ext2|ext3|reiserfs|xfs>\n\t\tWill skip filesystemselection\n\
- morphixinstaller --hostname <alfanumeric string>\n\t\tUse the specified hostname for installing\n\
- morphixinstaller --rootpass <string>\n\t\tUse the specified string as password for the root user\n\
- morphixinstaller --user <alfanumeric string> <string>\n\t\tUse the specified string as the username for the user being created, and the string after that for the user's password\n\
- morphixinstaller --lilo-mbr\n\t\tUse the selected harddisk for installing lilo on\n\
- morphixinstaller --lilo-root\n\t\tUse the selected rootpartition for installing lilo on\n\
- morphixinstaller --nolilo\n\t\tDon't install lilo\n\
- morphixinstaller --lilo-boot\n\t\tUse the selected bootpartition for installing lilo on\n\
- morphixinstaller --ui [cmdline|gtk|auto]\n\t\tUse the selected installer UI. Auto works only with one harddisk, one Linux partition and one Swap partition. Defaults are ext3 for the fs, Morphix for the hostname, morphix for the root password and morph/morph for the username/password. Lilo will be installed to the mbr. You can specify different values by using one of the above arguments. If you don't: MAKE SURE TO CHANGE THE PASSWORDS AFTER INSTALLING! I won't answer any email from people being hacked because they havn't changed their passwords, it is at your own risk!\n\
- \n\
- You may use any combination of these arguments, note that the lilo-options override eachother, the last one counts\n\
- \n\
- morphixinstaller --help | -h\n\t\tPrints commandline arguments and exits\n\
- \n\
- For questions, bugs, feedback or lynching please contact me via www.morphix.org\n\
- This program is licensed under the GNU GPL v2, copyright Alex de Landgraaf, 2003\n\n");
- }
-
- gboolean check_args(int *argcp, char ***argvp) {
- gint i;
- gint argc;
- argc = *argcp;
- gchar **argv;
- argv = *argvp;
- cmdlineargs.no_partitioning = FALSE;
- cmdlineargs.no_swap_partition = FALSE;
- cmdlineargs.swappart_set = FALSE;
- cmdlineargs.rootpart_set = FALSE;
- cmdlineargs.harddisk_set = FALSE;
- cmdlineargs.partitioner_set = FALSE;
- cmdlineargs.fs_set = FALSE;
- cmdlineargs.hostname_set = FALSE;
- cmdlineargs.rootpass_set = FALSE;
- cmdlineargs.user_set = FALSE;
- cmdlineargs.lilo_set = FALSE;
- cmdlineargs.ui_set = FALSE;
- cmdlineargs.ui_type = UI_GTK_TYPE;
- if (argc == 1)
- return;
-
- /*
- a dirty forloop-continue-return construction.
- couldn't be bothered doing it proper, sorry :)
- */
-
- for (i = 1; i < argc; i++) {
- if (strcmp(argv[i],"--debug") == 0 ||
- strcmp(argv[i],"-d") == 0) {
- debug_switch = 1;
- continue;
- }
- if (strcmp(argv[i],"--help") == 0 ||
- strcmp(argv[i],"-h") == 0) {
- return FALSE;
- }
- if (strcmp(argv[i],"--root") == 0) {
- if (++i >= argc)
- return FALSE;
- if (strlen(argv[i]) >= 15 ||
- !g_file_test(argv[i],G_FILE_TEST_EXISTS)) {
- printf("Root argument too long or invalid\n");
- return FALSE;
- }
- strcpy(cmdlineargs.rootpart,argv[i]);
- cmdlineargs.rootpart_set = TRUE;
- continue;
- }
- if (strcmp(argv[i],"--swap") == 0) {
- if (++i >= argc)
- return FALSE;
- if (strlen(argv[i]) >= 15 ||
- !g_file_test(argv[i],G_FILE_TEST_EXISTS)) {
- printf("Swap argument too long or invalid\n");
- return FALSE;
- }
- strcpy(cmdlineargs.swappart,argv[i]);
- cmdlineargs.swappart_set = TRUE;
- continue;
- }
- if (strcmp(argv[i],"--hdd") == 0) {
- if (++i >= argc)
- return FALSE;
- if (strlen(argv[i]) != 3) {
- printf("Hdd argument too long or invalid, needs to be 3 letters in length\n");
- return FALSE;
- }
- strcpy(cmdlineargs.harddisk,argv[i]);
- cmdlineargs.harddisk_set = TRUE;
- continue;
- }
- if (strcmp(argv[i],"--nopart") == 0) {
- cmdlineargs.no_partitioning = TRUE;
- continue;
- }
- if (strcmp(argv[i],"--noswap") == 0) {
- cmdlineargs.no_swap_partition = TRUE;
- continue;
- }
- if (strcmp(argv[i],"--part-with") == 0) {
- if (++i >= argc)
- return FALSE;
- if (strlen(argv[i]) >= 63 ||
- !g_file_test(argv[i],G_FILE_TEST_EXISTS)) {
- printf("Partitioner argument too long or invalid\n");
- return FALSE;
- }
- strcpy(cmdlineargs.partitioner,argv[i]);
- cmdlineargs.partitioner_set = TRUE;
- continue;
- }
- if (strcmp(argv[i],"--fs") == 0) {
- if (++i >= argc)
- return FALSE;
- if ((strcmp(argv[i],"ext2") == 0) || (strcmp(argv[i],"ext3") == 0) || (strcmp(argv[i],"reiserfs") == 0) || (strcmp(argv[i],"xfs") == 0)) {
- strcpy(cmdlineargs.fs,argv[i]);
- } else {
- printf("fs argument invalid\n");
- return FALSE;
- }
- cmdlineargs.fs_set = TRUE;
- continue;
- }
- if (strcmp(argv[i],"--hostname") == 0) {
- if (++i >= argc)
- return FALSE;
- if (strlen(argv[i]) >= 63) {
- printf("hostname argument too long or invalid\n");
- return FALSE;
- }
- gint j;
- for (j = 0; j < strlen(argv[i]); j++) {
- if (!g_ascii_isalnum(argv[i][j])) {
- printf("hostname argument contains invalid char\n");
- return FALSE;
- }
- }
- strcpy(cmdlineargs.hostname,argv[i]);
- cmdlineargs.hostname_set = TRUE;
- continue;
- }
- if (strcmp(argv[i],"--rootpass") == 0) {
- if (++i >= argc)
- return FALSE;
- if (strlen(argv[i]) >= 63) {
- printf("rootpass argument too long or invalid\n");
- return FALSE;
- }
- gint j;
- for (j = 0; j < strlen(argv[i]); j++) {
- if (!g_ascii_isalnum(argv[i][j])) {
- printf("rootpass argument contains invalid char\n");
- return FALSE;
- }
- }
- strcpy(cmdlineargs.rootpass,argv[i]);
- cmdlineargs.rootpass_set = TRUE;
- continue;
- }
- if (strcmp(argv[i],"--user") == 0) {
- if (++i >= argc) {
- printf("Need username and password\n");
- return FALSE;
- }
- if (strlen(argv[i]) >= 63) {
- printf("username argument too long or invalid\n");
- return FALSE;
- }
- gint j;
- for (j = 0; j < strlen(argv[i]); j++) {
- if (!g_ascii_isalnum(argv[i][j])) {
- printf("username argument contains invalid char\n");
- return FALSE;
- }
- }
- strcpy(cmdlineargs.username,argv[i]);
-
- if (++i >= argc) {
- printf("Need username and password\n");
- return FALSE;
- }
- if (strlen(argv[i]) >= 63) {
- printf("password argument too long or invalid\n");
- return FALSE;
- }
- for (j = 0; j < strlen(argv[i]); j++) {
- if (!g_ascii_isalnum(argv[i][j])) {
- printf("password argument contains invalid char\n");
- return FALSE;
- }
- }
- strcpy(cmdlineargs.userpass,argv[i]);
- cmdlineargs.user_set = TRUE;
-
- continue;
- }
- if (strcmp(argv[i],"--lilo-mbr") == 0) {
- /*
- lilo_mode:
- 1 - use selected_harddisk MBR
- 2 - use selected rootpartition
- 3 - don't use lilo
- 4 - use selected bootpartition
- */
- cmdlineargs.lilo_type = 1;
- cmdlineargs.lilo_set = TRUE;
- continue;
- }
- if (strcmp(argv[i],"--lilo-root") == 0) {
- cmdlineargs.lilo_type = 2;
- cmdlineargs.lilo_set = TRUE;
- continue;
- }
- if (strcmp(argv[i],"--nolilo") == 0) {
- cmdlineargs.lilo_type = 3;
- cmdlineargs.lilo_set = TRUE;
- continue;
- }
- if (strcmp(argv[i],"--lilo-boot") == 0) {
- cmdlineargs.lilo_type = 4;
- cmdlineargs.lilo_set = TRUE;
- continue;
- }
- if (strcmp(argv[i],"--ui") == 0) {
- if (++i >= argc)
- return FALSE;
- if (strcmp(argv[i],"cmdline") == 0) {
- cmdlineargs.ui_type = UI_CMDLINE_TYPE;
- cmdlineargs.ui_set = TRUE;
- continue;
- }
- if (strcmp(argv[i],"gtk") == 0) {
- cmdlineargs.ui_type = UI_GTK_TYPE;
- cmdlineargs.ui_set = TRUE;
- continue;
- }
- if (strcmp(argv[i],"auto") == 0) {
- cmdlineargs.ui_type = UI_AUTO_TYPE;
- cmdlineargs.ui_set = TRUE;
- continue;
- }
- }
- return FALSE;
- }
- }
int debug(const char *fmt, ...) {
--- 48,51 ----
|
|
From: <ale...@us...> - 2004-01-05 01:16:23
|
Update of /cvsroot/morphix/scripts-base/etc/init.d
In directory sc8-pr-cvs1:/tmp/cvs-serv12470
Modified Files:
knoppix-autoconfig morphix-start
Log Message:
0.4-1b changes
Index: knoppix-autoconfig
===================================================================
RCS file: /cvsroot/morphix/scripts-base/etc/init.d/knoppix-autoconfig,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** knoppix-autoconfig 6 Dec 2003 22:30:50 -0000 1.16
--- knoppix-autoconfig 4 Jan 2004 23:22:09 -0000 1.17
***************
*** 50,60 ****
}
! case "$CMDLINE" in *splash*) SPLASH="yes"; ;; esac
# Bootsplash section
if test -n "$SPLASH"; then
! #rc_splash "fsck start"
! echo "show 4000">/proc/splash
fi
--- 50,64 ----
}
! case "$CMDLINE" in
! *splash*)
! if [ -e "/proc/splash" ]; then
! SPLASH="yes";
! fi
! ;; esac
# Bootsplash section
if test -n "$SPLASH"; then
! echo "show 4000">/proc/splash 2>/dev/null
fi
***************
*** 471,476 ****
if test -n "$SPLASH"; then
! #rc_splash2 8000
! echo "show 8000">/proc/splash
fi
--- 475,479 ----
if test -n "$SPLASH"; then
! echo "show 8000">/proc/splash 2>/dev/null
fi
***************
*** 573,578 ****
if test -n "$SPLASH"; then
! #rc_splash2 12000
! echo "show 12000">/proc/splash
fi
--- 576,580 ----
if test -n "$SPLASH"; then
! echo "show 12000">/proc/splash 2>/dev/null
fi
***************
*** 672,677 ****
if test -n "$SPLASH"; then
! #rc_splash2 16000 >/dev/null 2>&1
! echo "show 16000">/proc/splash
fi
--- 674,678 ----
if test -n "$SPLASH"; then
! echo "show 16000">/proc/splash 2>/dev/null
fi
***************
*** 734,739 ****
if test -n "$SPLASH"; then
! #rc_splash2 20000
! echo "show 20000">/proc/splash
fi
--- 735,739 ----
if test -n "$SPLASH"; then
! echo "show 20000">/proc/splash 2>/dev/null
fi
***************
*** 799,804 ****
if test -n "$SPLASH"; then
! #rc_splash2 24000
! echo "show 24000">/proc/splash
fi
--- 799,803 ----
if test -n "$SPLASH"; then
! echo "show 24000">/proc/splash 2>/dev/null
fi
***************
*** 874,879 ****
if test -n "$SPLASH"; then
! echo "show 28000">/proc/splash
! #rc_splash2 28000
fi
--- 873,877 ----
if test -n "$SPLASH"; then
! echo "show 28000">/proc/splash 2>/dev/null
fi
***************
*** 891,895 ****
# Start creating /etc/fstab with HD partitions and USB SCSI devices now
echo -n "${BLUE}Scanning for Harddisk partitions and creating ${YELLOW}/etc/fstab${BLUE}... "
! rebuildfstab -r >/dev/null 2>&1
if [ -e /var/run/rebuildfstab.pid ]; then
# Another instance of rebuildfstab, probably from hotplug, is still running, so just wait.
--- 889,897 ----
# Start creating /etc/fstab with HD partitions and USB SCSI devices now
echo -n "${BLUE}Scanning for Harddisk partitions and creating ${YELLOW}/etc/fstab${BLUE}... "
! USERNAME="$(getbootparam username)"
! if [ -z $USERNAME ]; then
! USERNAME="morph"
! fi
! rebuildfstab -r -u $USERNAME >/dev/null 2>&1
if [ -e /var/run/rebuildfstab.pid ]; then
# Another instance of rebuildfstab, probably from hotplug, is still running, so just wait.
***************
*** 937,942 ****
if test -n "$SPLASH"; then
! echo "show 32000">/proc/splash
! #rc_splash2 32000
fi
--- 939,943 ----
if test -n "$SPLASH"; then
! echo "show 32000">/proc/splash 2>/dev/null
fi
Index: morphix-start
===================================================================
RCS file: /cvsroot/morphix/scripts-base/etc/init.d/morphix-start,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** morphix-start 6 Dec 2003 22:30:50 -0000 1.20
--- morphix-start 4 Jan 2004 23:22:09 -0000 1.21
***************
*** 21,29 ****
[ -f /etc/sysconfig/knoppix ] && . /etc/sysconfig/knoppix
CMDLINE="$(cat /proc/cmdline)"
-
case "$CMDLINE" in *splash*) SPLASH="yes"; ;; esac
num=$((200))
--- 21,34 ----
[ -f /etc/sysconfig/knoppix ] && . /etc/sysconfig/knoppix
+ [ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
CMDLINE="$(cat /proc/cmdline)"
case "$CMDLINE" in *splash*) SPLASH="yes"; ;; esac
+ USERNAME="$(getbootparam username)"
+ if [ -z $USERNAME ]; then
+ USERNAME="morph"
+ fi
+
num=$((200))
***************
*** 94,100 ****
return 1
}
if test -n "$SPLASH"; then
! # rc_splash
! echo "show 44000">/proc/splash 2>/dev/null
fi
# MainModule loading section
--- 99,107 ----
return 1
}
+
if test -n "$SPLASH"; then
! if [ -e /proc/splash ]; then
! echo "show 44000">/proc/splash 2>/dev/null
! fi
fi
# MainModule loading section
***************
*** 104,107 ****
--- 111,119 ----
echo "Loading Module $1"
+ USERNAME="$(getbootparam username)"
+ if [ -z $USERNAME ]; then
+ USERNAME="morph"
+ fi
+
# Load Module
***************
*** 154,160 ****
fi
if test -n "$SPLASH"; then
! # rc_splash
echo "show 48000">/proc/splash 2>/dev/null
!
fi
--- 166,172 ----
fi
if test -n "$SPLASH"; then
! if [ -e /proc/splash ]; then
echo "show 48000">/proc/splash 2>/dev/null
! fi
fi
***************
*** 184,199 ****
if [ -f "$MYHOMEDIR" ]; then
# It's a loopback file, mount it over the /home/morph directory
! mkdir /home/morph
! trymount "$MYHOMEDIR" /home/morph
RC="$?"
! [ "$RC" = "0" ] && ERROR="$(mount -o remount,rw /home/morph 2>&1)"
RC="$?"
else
# Do a --bind mount
! ERROR="$(mount --bind "$MYHOMEDIR" /home/morph 2>&1)"
RC="$?"
fi
! mount --bind /home/morph /mnt/main/home/morph
! [ "$RC" = "0" ] && echo "${GREEN}/home/morph mounted OK.${NORMAL}" || { echo "${RED}FAILED."; echo "$ERROR${NORMAL}"; }
fi
break
--- 196,211 ----
if [ -f "$MYHOMEDIR" ]; then
# It's a loopback file, mount it over the /home/morph directory
! mkdir /home/$USERNAME
! trymount "$MYHOMEDIR" /home/$USERNAME
RC="$?"
! [ "$RC" = "0" ] && ERROR="$(mount -o remount,rw /home/$USERNAME 2>&1)"
RC="$?"
else
# Do a --bind mount
! ERROR="$(mount --bind "$MYHOMEDIR" /home/$USERNAME 2>&1)"
RC="$?"
fi
! mount --bind /home/$USERNAME /mnt/main/home/$USERNAME
! [ "$RC" = "0" ] && echo "${GREEN}/home/$USERNAME mounted OK.${NORMAL}" || { echo "${RED}FAILED."; echo "$ERROR${NORMAL}"; }
fi
break
***************
*** 209,213 ****
# /home dir's, check permissions...
! chown morph.users /home/morph
# /dev files, should be a better way than this
--- 221,225 ----
# /home dir's, check permissions...
! chown $USERNAME.users /home/$USERNAME
# /dev files, should be a better way than this
***************
*** 217,261 ****
mount --bind /MorphixCD /mnt/main/MorphixCD
- # /var files, copy all to ramdisk, except for /var/lib
- # that is binded directly (saves precious ram)
- # same problem as with /etc
- #
- # Using translucency for this now
-
- #mkdir /ramdisk/mainvar 2> /dev/null
- #mkdir /ramdisk/mainvar/lib 2> /dev/null
- #mount --rbind /mnt/main/var/lib /ramdisk/mainvar/lib
-
- #src=$(ls /mnt/main/var | grep '[^lib]')
- #for i in $src;
- #do
- #cp -a /mnt/main/var/$i /ramdisk/mainvar
- #done;
-
- #mount --rbind /ramdisk/mainvar /mnt/main/var
-
if test -n "$SPLASH"; then
! $rc_splash
! echo "show 52000">/proc/splash
!
fi
- # /etc files, copy all to ramdisk, except for gconf
- # this is ofcourse a compromise, make sure /etc is small!
- #
- # Now using translucency instead
-
- #mkdir /ramdisk/mainetc 2> /dev/null
- #mkdir /ramdisk/mainetc/gconf 2> /dev/null
- #mkdir /ramdisk/mainetc/skel 2> /dev/null
- #mount --rbind /mnt/main/etc/gconf /ramdisk/mainetc/gconf
- #mount --rbind /mnt/main/etc/skel /ramdisk/mainetc/skel
- #src=$(ls /mnt/main/etc | grep '[^gconf]' | grep '[^skel]')
- #for i in $src;
- #do
- #cp -a /mnt/main/etc/$i /ramdisk/mainetc
- #done;
- #mount --rbind /ramdisk/mainetc /mnt/main/etc
-
# Translucency
BLOCKTRANS="$(getbootparam blocktrans)"
--- 229,238 ----
mount --bind /MorphixCD /mnt/main/MorphixCD
if test -n "$SPLASH"; then
! if [ -e /proc/splash ]; then
! echo "show 52000">/proc/splash
! fi
fi
# Translucency
BLOCKTRANS="$(getbootparam blocktrans)"
***************
*** 307,312 ****
if test -n "$SPLASH"; then
! # rc_splash2 44000
! echo "show 56000">/proc/splash
fi
--- 284,290 ----
if test -n "$SPLASH"; then
! if [ -e /proc/splash ]; then
! echo "show 56000">/proc/splash
! fi
fi
***************
*** 315,332 ****
mkdir /mnt/main/etc/sysconfig 2> /dev/null
- # *rolls eyes*
- #AUTOMOUNTER="yes"
- #if [ -n "$AUTOMOUNTER" ]; then
- # Check for floppy dir, reinstall with automounter
- # [ -d /mnt/floppy -a ! -L /mnt/floppy ] && rmdir /mnt/floppy
- # [ -d /mnt/auto/floppy ] || mkdir -p /mnt/auto/floppy
- # [ -L /mnt/floppy ] || ln -s /mnt/auto/floppy /mnt/floppy
- # [ -d /mnt/cdrom -a ! -L /mnt/cdrom ] && rmdir /mnt/cdrom
- # [ -d /mnt/auto/cdrom ] || mkdir -p /mnt/auto/cdrom
- # [ -L /mnt/cdrom ] || ln -s /mnt/auto/cdrom /mnt/cdrom
- # rm -f /etc/fstab.new
-
mkdir /mnt/main/cdrom >/dev/null 2>&1
- #mkdir /mnt/main/cdrom0
# Replace paths from bootfloppy using supermount
--- 293,297 ----
***************
*** 342,346 ****
mount --bind /cdrom /mnt/main/cdrom
-
# lots of stuff, might have to check which are _really_ necessary
# but for now it should work reasonably well...
--- 307,310 ----
***************
*** 354,360 ****
cp -af /MorphixCD/etc/inputrc /mnt/main/etc/inputrc
cp -af /MorphixCD/etc/pcmcia /mnt/main/etc/ >/dev/null 2>&1
- #cp -af /etc/passwd /mnt/main/etc/passwd # morph is now created otf...
- #cp -af /etc/shadow /mnt/main/etc/shadow
- #cp -af /etc/group /mnt/main/etc/group
cp -af /MorphixCD/etc/localtime /mnt/main/etc/localtime >/dev/null 2>&1
cp -af /etc/filesystems /mnt/main/etc/filesystems
--- 318,321 ----
***************
*** 366,369 ****
--- 327,336 ----
cp -af /etc/sysconfig/* /mnt/main/etc/sysconfig/
+ # lets set up our /etc/environment
+
+ echo "LANG=$LANG" > /mnt/main/etc/environment
+ echo "COUNTRY=$COUNTRY" >> /mnt/main/etc/environment
+ echo "LANGUAGE=$LANGUAGE" >> /mnt/main/etc/environment
+
# and some scripts we want in our mainmod...
***************
*** 381,402 ****
if test -n "$SPLASH"; then
! # rc_splash2 5000
! echo "show 60000">/proc/splash 2>/dev/null
!
fi
HOMEDIR="$(getbootparam home)"
if [ -z "$HOMEDIR" ]; then
! rmdir /mnt/main/home/morph
! chroot /mnt/main useradd -m morph
! chroot /mnt/main usermod -G dialout,fax,voice,dip,cdrom,floppy,tape,sudo,audio,video,games,users -U morph
! # cp -a /mnt/main/etc/skel /mnt/main/home/morph
! # chown -R morph.morph /mnt/main/home/morph
else
! chroot /mnt/main useradd morph
! chroot /mnt/main chown -R morph /home/morph
! chroot /mnt/main usermod -G dialout,fax,voice,dip,cdrom,floppy,tape,sudo,audio,video,games,users -U morph
fi
#cardmgr section
--- 348,380 ----
if test -n "$SPLASH"; then
! if [ -e /proc/splash ]; then
! echo "show 60000">/proc/splash 2>/dev/null
! fi
fi
HOMEDIR="$(getbootparam home)"
if [ -z "$HOMEDIR" ]; then
! rmdir /mnt/main/home/$USERNAME
! chroot /mnt/main useradd -m $USERNAME
else
! chroot /mnt/main useradd $USERNAME
! chroot /mnt/main chown -R $USERNAME /home/$USERNAME
fi
+ # wish this could be neater, but if one group fails they otherwise all would
+ chroot /mnt/main usermod -G dialout $USERNAME
+ chroot /mnt/main usermod -G fax $USERNAME
+ chroot /mnt/main usermod -G voice $USERNAME
+ chroot /mnt/main usermod -G dip $USERNAME
+ chroot /mnt/main usermod -G cdrom $USERNAME
+ chroot /mnt/main usermod -G floppy $USERNAME
+ chroot /mnt/main usermod -G tape $USERNAME
+ chroot /mnt/main usermod -G sudo $USERNAME
+ chroot /mnt/main usermod -G audio $USERNAME
+ chroot /mnt/main usermod -G video $USERNAME
+ chroot /mnt/main usermod -G games $USERNAME
+ chroot /mnt/main usermod -G users $USERNAME
+ chroot /mnt/main usermod -U $USERNAME
+
#cardmgr section
***************
*** 449,454 ****
if test -n "$SPLASH"; then
! # rc_splash2 58000
! echo "show 6400">/proc/splash 2>/dev/null
fi
--- 427,433 ----
if test -n "$SPLASH"; then
! if [ -e /proc/splash ]; then
! echo "show 6400">/proc/splash 2>/dev/null
! fi
fi
***************
*** 491,495 ****
if test -n "$SPLASH"; then
! echo "show 66000">/proc/splash 2>/dev/null
fi
--- 470,476 ----
if test -n "$SPLASH"; then
! if [ -e /proc/splash ]; then
! echo "show 66000">/proc/splash 2>/dev/null
! fi
fi
***************
*** 518,521 ****
--- 499,503 ----
if [ $COPY -gt 0 ]; then
chroot /mnt/main cp -a /cdrom/copy/* /
+ chroot /mnt/main chown -R $USERNAME /home/$USERNAME
fi
***************
*** 540,543 ****
--- 522,527 ----
# end single-module section
}
+
+
# ruthlessly copied from the myhomedir section
|
|
From: <ale...@us...> - 2004-01-05 00:45:14
|
Update of /cvsroot/morphix/morph-scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv27605
Modified Files:
baselist debwrap
Log Message:
and more updates, getting closer...
Index: baselist
===================================================================
RCS file: /cvsroot/morphix/morph-scripts/baselist,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** baselist 4 Jan 2004 23:51:51 -0000 1.2
--- baselist 5 Jan 2004 00:45:11 -0000 1.3
***************
*** 6,12 ****
apt-get -f install
apt-get --yes install hwdata-knoppix
! apt-get --yes hwsetup
! apt-get --yes kudzu-knoppix
! apt-get --yes kdbconfig
apt-get --yes --purge remove exim4
apt-get --yes --purge remove exim4-base
--- 6,24 ----
apt-get -f install
apt-get --yes install hwdata-knoppix
! apt-get --yes install hwsetup
! apt-get --yes install kudzu-knoppix
! apt-get --yes install xf86config-knoppix
! apt-get --yes install sysvinit
! apt-get --yes install ddcxinfo-knoppix
! apt-get --yes install rebuildfstab-knoppix
! apt-get --yes install hotplug-knoppix
! apt-get --yes install mkdoswapfile-knoppix
! apt-get --yes install kbdconfig
! apt-get --yes install sndconfig
! apt-get --yes install file
! apt-get --yes install mouseconfig
! apt-get --yes install cloop-module
! apt-get --yes install cloop-utils
! apt-get --yes install kernel-image-2.4.23-1-386
apt-get --yes --purge remove exim4
apt-get --yes --purge remove exim4-base
***************
*** 74,86 ****
mknod dev/nvidia7 c 195 7
mknod dev/nvidiactl c 195 255
! # libGL patch
! mkdir usr/lib/backup
! mv usr/lib/libGL.* usr/lib/backup
! mkdir usr/X11R6/lib/backup
! mv usr/X11R6/lib/libGL.* usr/X11R6/lib/backup/
! mkdir usr/X11R6/lib/modules/extensions/backup
! mv usr/X11R6/lib/modules/extensions/libGLcore.a usr/X11R6/lib/modules/extensions/backup/
! mv usr/X11R6/lib/modules/extensions/libglx.a usr/X11R6/lib/modules/extensions/backup/
! # removing redundant files for basemodule
rm -r usr/share/doc
rm -r usr/share/locale
--- 86,90 ----
mknod dev/nvidia7 c 195 7
mknod dev/nvidiactl c 195 255
! # removing redundant files for basemodule, this breaks dpkg/apt
rm -r usr/share/doc
rm -r usr/share/locale
***************
*** 88,92 ****
rm -r usr/share/unidata
rm -r usr/share/man
- rm -r var/lib/apt
rm var/lib/dpkg/available-old
rm var/lib/dpkg/status-old
--- 92,95 ----
Index: debwrap
===================================================================
RCS file: /cvsroot/morphix/morph-scripts/debwrap,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** debwrap 4 Jan 2004 23:51:52 -0000 1.3
--- debwrap 5 Jan 2004 00:45:11 -0000 1.4
***************
*** 74,83 ****
mkdir $1
debootstrap $2 $1 $3
- mkdir $1/MorphixCD
rmdir $1/initrd
rmdir $1/opt
rmdir $1/tmp
ln -s var/tmp $1/tmp
- mkdir $1/morphix
if [[ $3 != "" ]]
then
--- 74,81 ----
|
|
From: <ale...@us...> - 2004-01-04 23:51:55
|
Update of /cvsroot/morphix/morph-scripts In directory sc8-pr-cvs1:/tmp/cvs-serv18003 Modified Files: baselist debwrap Log Message: working further on autobuilding of basemodules Index: baselist =================================================================== RCS file: /cvsroot/morphix/morph-scripts/baselist,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** baselist 7 Dec 2003 23:17:22 -0000 1.1 --- baselist 4 Jan 2004 23:51:51 -0000 1.2 *************** *** 3,80 **** # deb http://developer.linuxtag.net/knoppix ./ # ! hwdata-knoppix ! hwsetup ! kudzu-knoppix ! kdbconfig ! REMOVE exim4 ! REMOVE exim4-base ! REMOVE at ! REMOVE mailx ! REMOVE logrotate ! REMOVE cron ! REMOVE ipchains ! REMOVE iptables ! REMOVE cpio ! REMOVE groff-base ! REMOVE klogd ! REMOVE sysklogd ! REMOVE lilo ! REMOVE syslinux ! REMOVE vim ! REMOVE libident ! REMOVE gcc-3.2-base ! REMOVE tasksel ! REMOVE ppp ! REMOVE pppoeconf ! REMOVE pppoe ! REMOVE pppconfig ! REMOVE fdutils ! REMOVE apt-utils ! REMOVE netkit-inetd ! REMOVE netbase ! REMOVE info ! REMOVE manpages ! REMOVE ed ! REMOVE nvi ! REMOVE libgnutls7 ! REMOVE liblockfile1 ! REMOVE whiptail ! REMOVE gettext-base ! REMOVE tcpd ! REMOVE libwrap0 ! REMOVE ncurses-base ! REMOVE ncurses-bin ! REMOVE libwrap0 ! REMOVE libgdbm3 ! REMOVE slang1 ! REMOVE libgpmg1 ! REMOVE liblzo1 ! REMOVE libpcap0.7 ! REMOVE libopencdk8 ! REMOVE libpcre3 ! REMOVE libtasn1-0 ! REMOVE libtextwrap1 ! REMOVE libdb2 ! REMOVE diff # can't apt-get anything without apt, PONR! ! REMOVE apt ! EXEC mknod dev/cloop b 240 0 ! EXEC mknod dev/cloop1 b 240 1 ! EXEC mknod dev/nvidia0 c 195 0 ! EXEC mknod dev/nvidia1 c 195 1 ! EXEC mknod dev/nvidia2 c 195 2 ! EXEC mknod dev/nvidia3 c 195 3 ! EXEC mknod dev/nvidia4 c 195 4 ! EXEC mknod dev/nvidia5 c 195 5 ! EXEC mknod dev/nvidia6 c 195 6 ! EXEC mknod dev/nvidia7 c 195 7 ! EXEC mknod dev/nvidiactl c 195 255 ! EXEC rm -r usr/share/doc ! EXEC rm -r usr/share/locale ! EXEC rm -r usr/share/zoneinfo ! EXEC rm -r usr/share/unidata ! EXEC rm -r usr/share/man ! EXEC rm -r var/lib/apt ! EXEC rm var/lib/dpkg/available-old ! EXEC rm var/lib/dpkg/status-old ! EXEC rm -r var/cache/* \ No newline at end of file --- 3,93 ---- # deb http://developer.linuxtag.net/knoppix ./ # ! apt-get update ! apt-get -f install ! apt-get --yes install hwdata-knoppix ! apt-get --yes hwsetup ! apt-get --yes kudzu-knoppix ! apt-get --yes kdbconfig ! apt-get --yes --purge remove exim4 ! apt-get --yes --purge remove exim4-base ! apt-get --yes --purge remove at ! apt-get --yes --purge remove mailx ! apt-get --yes --purge remove logrotate ! apt-get --yes --purge remove cron ! apt-get --yes --purge remove ipchains ! apt-get --yes --purge remove iptables ! apt-get --yes --purge remove cpio ! apt-get --yes --purge remove groff-base ! apt-get --yes --purge remove klogd ! apt-get --yes --purge remove sysklogd ! apt-get --yes --purge remove lilo ! apt-get --yes --purge remove syslinux ! apt-get --yes --purge remove vim ! apt-get --yes --purge remove libident ! apt-get --yes --purge remove gcc-3.2-base ! apt-get --yes --purge remove tasksel ! apt-get --yes --purge remove ppp ! apt-get --yes --purge remove pppoeconf ! apt-get --yes --purge remove pppoe ! apt-get --yes --purge remove pppconfig ! apt-get --yes --purge remove fdutils ! apt-get --yes --purge remove apt-utils ! apt-get --yes --purge remove netkit-inetd ! apt-get --yes --purge remove netbase ! apt-get --yes --purge remove info ! apt-get --yes --purge remove manpages ! apt-get --yes --purge remove ed ! apt-get --yes --purge remove nvi ! apt-get --yes --purge remove libgnutls7 ! apt-get --yes --purge remove liblockfile1 ! apt-get --yes --purge remove whiptail ! apt-get --yes --purge remove gettext-base ! apt-get --yes --purge remove tcpd ! apt-get --yes --purge remove libwrap0 ! apt-get --yes --purge remove ncurses-base ! apt-get --yes --purge remove ncurses-bin ! apt-get --yes --purge remove libwrap0 ! apt-get --yes --purge remove libgdbm3 ! apt-get --yes --purge remove slang1 ! apt-get --yes --purge remove libgpmg1 ! apt-get --yes --purge remove liblzo1 ! apt-get --yes --purge remove libpcap0.7 ! apt-get --yes --purge remove libopencdk8 ! apt-get --yes --purge remove libpcre3 ! apt-get --yes --purge remove libtasn1-0 ! apt-get --yes --purge remove libtextwrap1 ! apt-get --yes --purge remove libdb2 ! apt-get --yes --purge remove diff ! apt-get clean # can't apt-get anything without apt, PONR! ! # apt-get --yes --purge remove apt ! # making nvidia and cloop devicenodes ! mknod dev/cloop b 240 0 ! mknod dev/cloop1 b 240 1 ! mknod dev/nvidia0 c 195 0 ! mknod dev/nvidia1 c 195 1 ! mknod dev/nvidia2 c 195 2 ! mknod dev/nvidia3 c 195 3 ! mknod dev/nvidia4 c 195 4 ! mknod dev/nvidia5 c 195 5 ! mknod dev/nvidia6 c 195 6 ! mknod dev/nvidia7 c 195 7 ! mknod dev/nvidiactl c 195 255 ! # libGL patch ! mkdir usr/lib/backup ! mv usr/lib/libGL.* usr/lib/backup ! mkdir usr/X11R6/lib/backup ! mv usr/X11R6/lib/libGL.* usr/X11R6/lib/backup/ ! mkdir usr/X11R6/lib/modules/extensions/backup ! mv usr/X11R6/lib/modules/extensions/libGLcore.a usr/X11R6/lib/modules/extensions/backup/ ! mv usr/X11R6/lib/modules/extensions/libglx.a usr/X11R6/lib/modules/extensions/backup/ ! # removing redundant files for basemodule ! rm -r usr/share/doc ! rm -r usr/share/locale ! rm -r usr/share/zoneinfo ! rm -r usr/share/unidata ! rm -r usr/share/man ! rm -r var/lib/apt ! rm var/lib/dpkg/available-old ! rm var/lib/dpkg/status-old ! rm -r var/cache/* \ No newline at end of file Index: debwrap =================================================================== RCS file: /cvsroot/morphix/morph-scripts/debwrap,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** debwrap 7 Dec 2003 23:17:22 -0000 1.2 --- debwrap 4 Jan 2004 23:51:52 -0000 1.3 *************** *** 13,31 **** echo "Usage:" echo ! echo "debwrap -d /file/newdir [SUITE [ MIRROR] ]" ! echo " - debootstrap new directory, apply changes for mainmodule, don't build one" ! echo "debwrap -c /file/newdir MainModule-fubar.mod [SUITE [ MIRROR] ]" ! echo " - same as '-d', but also create a mainmodule from the directory" echo ! echo "debwrap -dl /file/newdir /file/packagelist [SUITE [ MIRROR] ]" ! echo " - same as '-d', but apt-get every file in the package list" echo " (newline seperated list of debian packages)" ! echo "debwrap -cl /file/packagelist /file/newdir MainModule-fubar.mod [SUITE [ MIRROR] ]" ! echo " - '-dl' and '-c' combined, you get the drill" echo ! echo "debwrap -dls /file/newdir /file/packagelist [SUITE [ MIRROR] ]" ! echo " - same as '-dl', but also copies your /etc/apt/sources.list over" ! echo "debwrap -cls /file/packagelist /file/newdir MainModule-fubar.mod [SUITE [ MIRROR] ]" ! echo " - guess :)" } --- 13,30 ---- echo "Usage:" echo ! echo "debwrap -d DIRECTORY [SUITE [ MIRROR] ]" ! echo " debootstrap new directory, apply changes for mainmodule, don't build one" ! echo "debwrap -c DIRECTORY MODULE [SUITE [ MIRROR] ]" ! echo " same as '-d', but also create a mainmodule from the directory" echo ! echo "debwrap -dl DIRECTORY PACKAGELIST [SUITE [ MIRROR] ]" ! echo " same as '-d', but apt-get every file in the package list using the hosts /etc/apt/sources.list" echo " (newline seperated list of debian packages)" ! echo "debwrap -cl DIRECTORY PACKAGELIST MODULE [SUITE [ MIRROR] ]" ! echo " '-dl' and '-c' combined, you get the drill" echo ! echo "debwrap -de DIRECTORY SHELLSCRIPT [SUITE [ MIRROR] ]" ! echo " same as '-dl', but instead executes the shellscript in the new filesystem" ! echo "debwrap -ce DIRECTORY SHELLSCRIPT MODULE [SUITE [ MIRROR] ]" } *************** *** 42,48 **** $1 != "-dl" && $1 != "-cl" && ! $1 != "-dls" && ! $1 != "-cls" && ! $1 != "-apt-get-list" ]] then --- 41,48 ---- $1 != "-dl" && $1 != "-cl" && ! $1 != "-de" && ! $1 != "-ce" && ! $1 != "-apt-get-list" && ! $1 != "-exe-shellscript" ]] then *************** *** 52,55 **** --- 52,63 ---- MYNAME=$0 + run_chrooted_exe() { + cp $MYNAME $1/debwrap + cp $2 $1/exescript + chroot $1/ sh ./debwrap -exe-shellscript ./exescript + rm $1/exescript + rm $1/debwrap + } + run_chrooted_apt() { cp $MYNAME $1/debwrap *************** *** 105,120 **** } - libX_patch() { - mkdir usr/lib/backup - mv usr/lib/libGL.* usr/lib/backup - - mkdir usr/X11R6/lib/backup - mv usr/X11R6/lib/libGL.* usr/X11R6/lib/backup/ - - mkdir usr/X11R6/lib/modules/extensions/backup - mv usr/X11R6/lib/modules/extensions/libGLcore.a usr/X11R6/lib/modules/extensions/backup/ - mv usr/X11R6/lib/modules/extensions/libglx.a usr/X11R6/lib/modules/extensions/backup/ - } - add_sources() { cp /etc/apt/sources.list $1/etc/apt/sources.list --- 113,116 ---- *************** *** 134,137 **** --- 130,138 ---- # flag file-list # we could use some kind of xml file to add/remove packages... + if [[ $1 == "-exe-shellscript" && $2 != "" ]] + then + sh $2 + fi + if [[ $1 == "-apt-get-list" && $2 != "" ]] then *************** *** 142,154 **** then echo - elif [[ $line == EXEC* ]] - then - line=${line:4} - `$line` - elif [[ $line == REMOVE* ]] - then - line=${line:6} - apt-get --yes remove $line - dpkg --force-all --purge $line else apt-get --yes install $line --- 143,146 ---- *************** *** 156,162 **** done < $2 apt-get clean - libX_patch fi # flag directory modulename.mod [suite [ mirror ]] if [[ $1 == "-c" && $2 != "" && $3 != "" ]] --- 148,155 ---- done < $2 apt-get clean fi + # should use the normal means of taking arguments here... + # flag directory modulename.mod [suite [ mirror ]] if [[ $1 == "-c" && $2 != "" && $3 != "" ]] *************** *** 170,173 **** --- 163,167 ---- then do_debootstrap $2 $4 $5 + add_sources $2 run_chrooted_apt $2 $3 fi *************** *** 177,198 **** then do_debootstrap $2 $5 $6 run_chrooted_apt $2 $3 build_module $2 $4 fi ! # flag directory packagelist [suite [ mirror ]] ! if [[ $1 == "-dls" && $2 != "" && $3 != "" ]] then do_debootstrap $2 $4 $5 add_sources $2 ! run_chrooted_apt $2 $3 fi ! # flag directory packagelist modulename.mod [suite [ mirror ]] ! if [[ $1 == "-cls" && $2 != "" && $3 != "" && $4 != "" ]] then do_debootstrap $2 $5 $6 add_sources $2 ! run_chrooted_apt $2 $3 build_module $2 $4 fi --- 171,193 ---- then do_debootstrap $2 $5 $6 + add_sources $2 run_chrooted_apt $2 $3 build_module $2 $4 fi ! # flag directory script [suite [ mirror ]] ! if [[ $1 == "-de" && $2 != "" && $3 != "" ]] then do_debootstrap $2 $4 $5 add_sources $2 ! run_chrooted_exe $2 $3 fi ! # flag directory script modulename.mod [suite [ mirror ]] ! if [[ $1 == "-ce" && $2 != "" && $3 != "" && $4 != "" ]] then do_debootstrap $2 $5 $6 add_sources $2 ! run_chrooted_exe $2 $3 build_module $2 $4 fi |
|
From: <ale...@us...> - 2004-01-04 23:22:59
|
Update of /cvsroot/morphix/scripts-base/usr/sbin
In directory sc8-pr-cvs1:/tmp/cvs-serv12663
Modified Files:
mkxf86config
Log Message:
0.4-1b changes
Index: mkxf86config
===================================================================
RCS file: /cvsroot/morphix/scripts-base/usr/sbin/mkxf86config,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mkxf86config 12 May 2003 22:54:01 -0000 1.2
--- mkxf86config 4 Jan 2004 23:22:55 -0000 1.3
***************
*** 60,70 ****
[ -n "$XSCREEN" ] && { echo "XSCREEN='$XSCREEN'" >> /etc/sysconfig/knoppix ; echo "XSCREEN='$XSCREEN'" >> /etc/sysconfig/xserver; }
XVREFRESH="$(getbootparam xvrefresh 2>/dev/null)"
- # Added for Hrefresh rates
- [ -n "$YVREFRESH" ] || YVREFRESH="$(getbootparam hrefresh 2> /dev/null)"
- [ -n "$YVREFRESH" ] || YVREFRESH="$(getbootparam hsync 2> /dev/null)"
[ -n "$XVREFRESH" ] || XVREFRESH="$(getbootparam vrefresh 2>/dev/null)"
[ -n "$XVREFRESH" ] || XVREFRESH="$(getbootparam xvsync 2>/dev/null)"
[ -n "$XVREFRESH" ] || XVREFRESH="$(getbootparam vsync 2>/dev/null)"
[ -n "$XVREFRESH" ] && { echo "XVREFRESH='$XVREFRESH'" >> /etc/sysconfig/knoppix ; echo "XVREFRESH='$XVREFRESH'" >> /etc/sysconfig/xserver; }
XDEPTH="$(getbootparam xdepth 2>/dev/null)"
[ -n "$XDEPTH" ] || XDEPTH="$(getbootparam depth 2>/dev/null)"
--- 60,72 ----
[ -n "$XSCREEN" ] && { echo "XSCREEN='$XSCREEN'" >> /etc/sysconfig/knoppix ; echo "XSCREEN='$XSCREEN'" >> /etc/sysconfig/xserver; }
XVREFRESH="$(getbootparam xvrefresh 2>/dev/null)"
[ -n "$XVREFRESH" ] || XVREFRESH="$(getbootparam vrefresh 2>/dev/null)"
[ -n "$XVREFRESH" ] || XVREFRESH="$(getbootparam xvsync 2>/dev/null)"
[ -n "$XVREFRESH" ] || XVREFRESH="$(getbootparam vsync 2>/dev/null)"
[ -n "$XVREFRESH" ] && { echo "XVREFRESH='$XVREFRESH'" >> /etc/sysconfig/knoppix ; echo "XVREFRESH='$XVREFRESH'" >> /etc/sysconfig/xserver; }
+ XHREFRESH="$(getbootparam xhrefresh 2>/dev/null)"
+ [ -n "$XHREFRESH" ] || XHREFRESH="$(getbootparam hrefresh 2>/dev/null)"
+ [ -n "$XHREFRESH" ] || XHREFRESH="$(getbootparam xhsync 2>/dev/null)"
+ [ -n "$XHREFRESH" ] || XHREFRESH="$(getbootparam hsync 2>/dev/null)"
+ [ -n "$XHREFRESH" ] && { echo "XHREFRESH='$XHREFRESH'" >> /etc/sysconfig/knoppix ; echo "XHREFRESH='$XHREFRESH'" >> /etc/sysconfig/xserver; }
XDEPTH="$(getbootparam xdepth 2>/dev/null)"
[ -n "$XDEPTH" ] || XDEPTH="$(getbootparam depth 2>/dev/null)"
***************
*** 72,87 ****
# Wheel
WHEEL=""
- #checkbootparam "wheel" && WHEEL='s|"PS/2"|"IMPS/2"\
- #Option "ZAxisMapping" "4 5"|g;'
-
if checkbootparam "wheel"; then
WHEEL='s|"PS/2"|"IMPS/2"\
Option "ZAxisMapping" "4 5"|g;'
else
! # Apparently, the mouse auto-protocol option works in XFree 4.3 now. Let's give it a try
WHEEL='s|"PS/2"|"auto"\
Option "ZAxisMapping" "4 5"|g;'
fi
# Read in changes
[ -f /etc/sysconfig/knoppix ] && . /etc/sysconfig/knoppix
--- 74,107 ----
# Wheel
WHEEL=""
if checkbootparam "wheel"; then
WHEEL='s|"PS/2"|"IMPS/2"\
Option "ZAxisMapping" "4 5"|g;'
+ elif checkbootparam "nowheel"; then
+ # Don't change the default, which is plain PS/2
+ WHEEL=""
else
! # Apparently, the mouse auto-protocol option works in XFree 4.3 now. Let's give it a try.
WHEEL='s|"PS/2"|"auto"\
Option "ZAxisMapping" "4 5"|g;'
fi
+ NVGLCORE=""
+ NVDRI=""
+ # Force Nvidia to be used
+ if checkbootparam "nonvidia"; then
+ echo "Skipping Proprietary nvidiadrivers"
+ # Dont use prop nvidia!
+ else
+
+ if [ "$XMODULE" = "nvidia" -o "$XMODULE" = "nv" ]; then
+ NONPROP=`echo "$XDESC" | grep "TNT"`
+ if [ -z $NONPROP ]; then
+ NVGLCORE='s|^.*Load.*"GLcore".*$|#Load "GLcore"|g;'
+ NVDRI='s|^.*Load.*"dri".*$|#Load "dri"|g;'
+ XMODULE="nvidia"
+ fi
+ fi
+ fi
+
# Read in changes
[ -f /etc/sysconfig/knoppix ] && . /etc/sysconfig/knoppix
***************
*** 108,119 ****
fi
- NVGLCORE=""
- NVDRI=""
- if [ "$XMODULE" = "nvidia" -o "$XMODULE" = "nv" ]; then
- NVGLCORE='s|^.*Load.*"GLcore".*$|#Load "GLcore"|g;'
- NVDRI='s|^.*Load.*"dri".*$|#Load "dri"|g;'
- XMODULE="nvidia"
- fi
-
NODDC=""
checkbootparam noddc && NODDC="true"
--- 128,131 ----
***************
*** 139,165 ****
# HorizSync 28.0 - 78.0 # Warning: This may fry very old Monitors
HorizSync 28.0 - 96.0 # Warning: This may fry old Monitors
! VertRefresh 50.0 - 76.0 # Very conservative. May flicker.
! # These are some Modelines that happen to work on many systems
! # Especially the "1024x768" has been thoroughly tested, even on Laptops
! Modeline "640x480" 25.175 640 664 760 800 480 491 493 525 #60Hz
! Modeline "800x600" 40.12 800 848 968 1056 600 601 605 628 #60Hz
! Modeline "1024x768" 85 1024 1056 1152 1360 768 784 787 823
! Modeline "1152x864" 92 1152 1208 1368 1474 864 865 875 895
! Modeline "1152x864" 110 1152 1240 1324 1552 864 864 876 908
! Modeline "1152x864" 135 1152 1464 1592 1776 864 864 876 908
! Modeline "1152x864" 137.65 1152 1184 1312 1536 864 866 885 902 -HSync -VSync
! Modeline "1280x1024" 80 1280 1296 1512 1568 1024 1025 1037 1165 Interlace
! Modeline "1280x1024" 110 1280 1328 1512 1712 1024 1025 1028 1054
! Modeline "1280x1024" 126.5 1280 1312 1472 1696 1024 1032 1040 1068 -HSync -VSync
! Modeline "1280x1024" 135 1280 1312 1456 1712 1024 1027 1030 1064
! Modeline "1280x1024" 135 1280 1312 1416 1664 1024 1027 1030 1064
! Modeline "1280x1024" 157.5 1280 1344 1504 1728 1024 1025 1028 1072 +HSync +VSync
! Modeline "1280x1024" 181.75 1280 1312 1440 1696 1024 1031 1046 1072 -HSync -VSync
! Modeline "1600x1200" 162 1600 1664 1856 2160 1200 1201 1204 1250 +HSync +VSync
! Modeline "1600x1200" 189 1600 1664 1856 2160 1200 1201 1204 1250 -HSync -VSync
! Modeline "1600x1200" 202.5 1600 1664 1856 2160 1200 1201 1204 1250 +HSync +VSync
! Modeline "1600x1200" 220 1600 1616 1808 2080 1200 1204 1207 1244 +HSync +VSync
ModeLine "1800x1440" 230 1800 1896 2088 2392 1440 1441 1444 1490 +HSync +VSync
ModeLine "1800x1440" 250 1800 1896 2088 2392 1440 1441 1444 1490 +HSync +VSync
EndSection
'
--- 151,275 ----
# HorizSync 28.0 - 78.0 # Warning: This may fry very old Monitors
HorizSync 28.0 - 96.0 # Warning: This may fry old Monitors
! # VertRefresh 50.0 - 76.0 # Very conservative. May flicker.
! VertRefresh 50.0 - 60.0 # Extreme conservative. Will flicker. TFT default.
!
! # Default modes distilled from
! # "VESA and Industry Standards and Guide for Computer Display Monitor
! # Timing", version 1.0, revision 0.8, adopted September 17, 1998.
! # $XFree86: xc/programs/Xserver/hw/xfree86/etc/vesamodes,v 1.4 1999/11/18 16:52:17 tsi Exp $
! # 640x350 @ 85Hz (VESA) hsync: 37.9kHz
! ModeLine "640x350" 31.5 640 672 736 832 350 382 385 445 +hsync -vsync
! # 640x400 @ 85Hz (VESA) hsync: 37.9kHz
! ModeLine "640x400" 31.5 640 672 736 832 400 401 404 445 -hsync +vsync
! # 720x400 @ 85Hz (VESA) hsync: 37.9kHz
! ModeLine "720x400" 35.5 720 756 828 936 400 401 404 446 -hsync +vsync
! # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz
! ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync
! # 640x480 @ 72Hz (VESA) hsync: 37.9kHz
! ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync
! # 640x480 @ 75Hz (VESA) hsync: 37.5kHz
! ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync
! # 640x480 @ 85Hz (VESA) hsync: 43.3kHz
! ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync
! # 800x600 @ 56Hz (VESA) hsync: 35.2kHz
! ModeLine "800x600" 36.0 800 824 896 1024 600 601 603 625 +hsync +vsync
! # 800x600 @ 60Hz (VESA) hsync: 37.9kHz
! ModeLine "800x600" 40.0 800 840 968 1056 600 601 605 628 +hsync +vsync
! # 800x600 @ 72Hz (VESA) hsync: 48.1kHz
! ModeLine "800x600" 50.0 800 856 976 1040 600 637 643 666 +hsync +vsync
! # 800x600 @ 75Hz (VESA) hsync: 46.9kHz
! ModeLine "800x600" 49.5 800 816 896 1056 600 601 604 625 +hsync +vsync
! # 800x600 @ 85Hz (VESA) hsync: 53.7kHz
! ModeLine "800x600" 56.3 800 832 896 1048 600 601 604 631 +hsync +vsync
! # 1024x768i @ 43Hz (industry standard) hsync: 35.5kHz
! ModeLine "1024x768" 44.9 1024 1032 1208 1264 768 768 776 817 +hsync +vsync Interlace
! # 1024x768 @ 60Hz (VESA) hsync: 48.4kHz
! ModeLine "1024x768" 65.0 1024 1048 1184 1344 768 771 777 806 -hsync -vsync
! # 1024x768 @ 70Hz (VESA) hsync: 56.5kHz
! ModeLine "1024x768" 75.0 1024 1048 1184 1328 768 771 777 806 -hsync -vsync
! # 1024x768 @ 75Hz (VESA) hsync: 60.0kHz
! ModeLine "1024x768" 78.8 1024 1040 1136 1312 768 769 772 800 +hsync +vsync
! # 1024x768 @ 85Hz (VESA) hsync: 68.7kHz
! ModeLine "1024x768" 94.5 1024 1072 1168 1376 768 769 772 808 +hsync +vsync
! # 1152x864 @ 75Hz (VESA) hsync: 67.5kHz
! ModeLine "1152x864" 108.0 1152 1216 1344 1600 864 865 868 900 +hsync +vsync
! # 1280x960 @ 60Hz (VESA) hsync: 60.0kHz
! ModeLine "1280x960" 108.0 1280 1376 1488 1800 960 961 964 1000 +hsync +vsync
! # 1280x960 @ 85Hz (VESA) hsync: 85.9kHz
! ModeLine "1280x960" 148.5 1280 1344 1504 1728 960 961 964 1011 +hsync +vsync
! # 1280x1024 @ 60Hz (VESA) hsync: 64.0kHz
! ModeLine "1280x1024" 108.0 1280 1328 1440 1688 1024 1025 1028 1066 +hsync +vsync
! # 1280x1024 @ 75Hz (VESA) hsync: 80.0kHz
! ModeLine "1280x1024" 135.0 1280 1296 1440 1688 1024 1025 1028 1066 +hsync +vsync
! # 1280x1024 @ 85Hz (VESA) hsync: 91.1kHz
! ModeLine "1280x1024" 157.5 1280 1344 1504 1728 1024 1025 1028 1072 +hsync +vsync
! # 1600x1200 @ 60Hz (VESA) hsync: 75.0kHz
! ModeLine "1600x1200" 162.0 1600 1664 1856 2160 1200 1201 1204 1250 +hsync +vsync
! # 1600x1200 @ 65Hz (VESA) hsync: 81.3kHz
! ModeLine "1600x1200" 175.5 1600 1664 1856 2160 1200 1201 1204 1250 +hsync +vsync
! # 1600x1200 @ 70Hz (VESA) hsync: 87.5kHz
! ModeLine "1600x1200" 189.0 1600 1664 1856 2160 1200 1201 1204 1250 +hsync +vsync
! # 1600x1200 @ 75Hz (VESA) hsync: 93.8kHz
! ModeLine "1600x1200" 202.5 1600 1664 1856 2160 1200 1201 1204 1250 +hsync +vsync
! # 1600x1200 @ 85Hz (VESA) hsync: 106.3kHz
! ModeLine "1600x1200" 229.5 1600 1664 1856 2160 1200 1201 1204 1250 +hsync +vsync
! # 1792x1344 @ 60Hz (VESA) hsync: 83.6kHz
! ModeLine "1792x1344" 204.8 1792 1920 2120 2448 1344 1345 1348 1394 -hsync +vsync
! # 1792x1344 @ 75Hz (VESA) hsync: 106.3kHz
! ModeLine "1792x1344" 261.0 1792 1888 2104 2456 1344 1345 1348 1417 -hsync +vsync
! # 1856x1392 @ 60Hz (VESA) hsync: 86.3kHz
! ModeLine "1856x1392" 218.3 1856 1952 2176 2528 1392 1393 1396 1439 -hsync +vsync
! # 1856x1392 @ 75Hz (VESA) hsync: 112.5kHz
! ModeLine "1856x1392" 288.0 1856 1984 2208 2560 1392 1393 1396 1500 -hsync +vsync
! # 1920x1440 @ 60Hz (VESA) hsync: 90.0kHz
! ModeLine "1920x1440" 234.0 1920 2048 2256 2600 1440 1441 1444 1500 -hsync +vsync
! # 1920x1440 @ 75Hz (VESA) hsync: 112.5kHz
! ModeLine "1920x1440" 297.0 1920 2064 2288 2640 1440 1441 1444 1500 -hsync +vsync
! # Additional modelines
ModeLine "1800x1440" 230 1800 1896 2088 2392 1440 1441 1444 1490 +HSync +VSync
ModeLine "1800x1440" 250 1800 1896 2088 2392 1440 1441 1444 1490 +HSync +VSync
+ # Extended modelines with GTF timings
+ # 640x480 @ 100.00 Hz (GTF) hsync: 50.90 kHz; pclk: 43.16 MHz
+ ModeLine "640x480" 43.16 640 680 744 848 480 481 484 509 -HSync +Vsync
+ # 768x576 @ 60.00 Hz (GTF) hsync: 35.82 kHz; pclk: 34.96 MHz
+ ModeLine "768x576" 34.96 768 792 872 976 576 577 580 597 -HSync +Vsync
+ # 768x576 @ 72.00 Hz (GTF) hsync: 43.27 kHz; pclk: 42.93 MHz
+ ModeLine "768x576" 42.93 768 800 880 992 576 577 580 601 -HSync +Vsync
+ # 768x576 @ 75.00 Hz (GTF) hsync: 45.15 kHz; pclk: 45.51 MHz
+ ModeLine "768x576" 45.51 768 808 888 1008 576 577 580 602 -HSync +Vsync
+ # 768x576 @ 85.00 Hz (GTF) hsync: 51.42 kHz; pclk: 51.84 MHz
+ ModeLine "768x576" 51.84 768 808 888 1008 576 577 580 605 -HSync +Vsync
+ # 768x576 @ 100.00 Hz (GTF) hsync: 61.10 kHz; pclk: 62.57 MHz
+ ModeLine "768x576" 62.57 768 816 896 1024 576 577 580 611 -HSync +Vsync
+ # 800x600 @ 100.00 Hz (GTF) hsync: 63.60 kHz; pclk: 68.18 MHz
+ ModeLine "800x600" 68.18 800 848 936 1072 600 601 604 636 -HSync +Vsync
+ # 1024x768 @ 100.00 Hz (GTF) hsync: 81.40 kHz; pclk: 113.31 MHz
+ ModeLine "1024x768" 113.31 1024 1096 1208 1392 768 769 772 814 -HSync +Vsync
+ # 1152x864 @ 60.00 Hz (GTF) hsync: 53.70 kHz; pclk: 81.62 MHz
+ ModeLine "1152x864" 81.62 1152 1216 1336 1520 864 865 868 895 -HSync +Vsync
+ # 1152x864 @ 85.00 Hz (GTF) hsync: 77.10 kHz; pclk: 119.65 MHz
+ ModeLine "1152x864" 119.65 1152 1224 1352 1552 864 865 868 907 -HSync +Vsync
+ # 1152x864 @ 100.00 Hz (GTF) hsync: 91.50 kHz; pclk: 143.47 MHz
+ ModeLine "1152x864" 143.47 1152 1232 1360 1568 864 865 868 915 -HSync +Vsync
+ # 1280x960 @ 72.00 Hz (GTF) hsync: 72.07 kHz; pclk: 124.54 MHz
+ ModeLine "1280x960" 124.54 1280 1368 1504 1728 960 961 964 1001 -HSync +Vsync
+ # 1280x960 @ 75.00 Hz (GTF) hsync: 75.15 kHz; pclk: 129.86 MHz
+ ModeLine "1280x960" 129.86 1280 1368 1504 1728 960 961 964 1002 -HSync +Vsync
+ # 1280x960 @ 100.00 Hz (GTF) hsync: 101.70 kHz; pclk: 178.99 MHz
+ ModeLine "1280x960" 178.99 1280 1376 1520 1760 960 961 964 1017 -HSync +Vsync
+ # 1280x1024 @ 100.00 Hz (GTF) hsync: 108.50 kHz; pclk: 190.96 MHz
+ ModeLine "1280x1024" 190.96 1280 1376 1520 1760 1024 1025 1028 1085 -HSync +Vsync
+ # 1400x1050 @ 60.00 Hz (GTF) hsync: 65.22 kHz; pclk: 122.61 MHz
+ ModeLine "1400x1050" 122.61 1400 1488 1640 1880 1050 1051 1054 1087 -HSync +Vsync
+ # 1400x1050 @ 72.00 Hz (GTF) hsync: 78.77 kHz; pclk: 149.34 MHz
+ ModeLine "1400x1050" 149.34 1400 1496 1648 1896 1050 1051 1054 1094 -HSync +Vsync
+ # 1400x1050 @ 75.00 Hz (GTF) hsync: 82.20 kHz; pclk: 155.85 MHz
+ ModeLine "1400x1050" 155.85 1400 1496 1648 1896 1050 1051 1054 1096 -HSync +Vsync
+ # 1400x1050 @ 85.00 Hz (GTF) hsync: 93.76 kHz; pclk: 179.26 MHz
+ ModeLine "1400x1050" 179.26 1400 1504 1656 1912 1050 1051 1054 1103 -HSync +Vsync
+ # 1400x1050 @ 100.00 Hz (GTF) hsync: 111.20 kHz; pclk: 214.39 MHz
+ ModeLine "1400x1050" 214.39 1400 1512 1664 1928 1050 1051 1054 1112 -HSync +Vsync
+ # 1600x1200 @ 100.00 Hz (GTF) hsync: 127.10 kHz; pclk: 280.64 MHz
+ ModeLine "1600x1200" 280.64 1600 1728 1904 2208 1200 1201 1204 1271 -HSync +Vsync
EndSection
'
***************
*** 207,213 ****
fi
! # Use commandline horizontal syncrate if specified
! if [ -n "$YVREFRESH" ]; then
! MONITOR="$(sed 's|HorizSync[ ].*$|HorizSync 28.0 - '"$YVREFRESH"'|g;' <<EOF
$MONITOR
EOF
--- 317,323 ----
fi
! # Use commandline horizontal refresh rate if specified
! if [ -n "$XHREFRESH" ]; then
! MONITOR="$(sed 's|HorizSync[ ].*$|HorizSync 28.0 - '"$XHREFRESH"'|g;' <<EOF
$MONITOR
EOF
***************
*** 283,287 ****
-e 's|@@MONITOR@@||g' \
-e 's|@@NOPM@@|'"$NOPM"'|g' \
! -e 's|@@XMODULE@@|'"$XMODULE"'|g;'"$VMWARE""$SERIALMOUSE""$USBMOUSE""$PSMOUSE""$SWCURSOR""$WHEEL""$NVGLCORE""$NVDRI" \
-e 's|@@MODES@@|'"$MODES"'|g;'"$DEPTH" \
-e 's|"XkbLayout" *"[^"]*"|"XkbLayout" "'"$XKEYBOARD"'"|g;'"$DEADKEYS" \
--- 393,397 ----
-e 's|@@MONITOR@@||g' \
-e 's|@@NOPM@@|'"$NOPM"'|g' \
! -e 's|@@XMODULE@@|'"$XMODULE"'|g;'"$VMWARE""$SERIALMOUSE""$USBMOUSE""$PSMOUSE""$SWCURSOR""$WHEEL""$NVGLCORE""$NVDRI" \
-e 's|@@MODES@@|'"$MODES"'|g;'"$DEPTH" \
-e 's|"XkbLayout" *"[^"]*"|"XkbLayout" "'"$XKEYBOARD"'"|g;'"$DEADKEYS" \
|
|
From: <ale...@us...> - 2004-01-04 09:41:48
|
Update of /cvsroot/morphix/morphixinstaller/po In directory sc8-pr-cvs1:/tmp/cvs-serv28289 Added Files: fr.po Log Message: adding french translation --- NEW FILE: fr.po --- (This appears to be a binary file; contents omitted.) |
|
From: <ale...@us...> - 2004-01-03 22:00:04
|
Update of /cvsroot/morphix/morphixinstaller/src
In directory sc8-pr-cvs1:/tmp/cvs-serv24467/src
Modified Files:
interface.c interface.h
Log Message:
removed some old gui code
Index: interface.c
===================================================================
RCS file: /cvsroot/morphix/morphixinstaller/src/interface.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** interface.c 26 Oct 2003 22:56:18 -0000 1.11
--- interface.c 3 Jan 2004 21:59:57 -0000 1.12
***************
*** 71,74 ****
--- 71,75 ----
gtk_box_pack_end (GTK_BOX (hbox2), label2, TRUE, FALSE, 0);
gtk_widget_set_size_request (label2, 400, 200);
+ gtk_label_set_justify (GTK_LABEL (label2), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label2), TRUE);
***************
*** 146,149 ****
--- 147,151 ----
gtk_widget_show (label25);
gtk_box_pack_start (GTK_BOX (vbox44), label25, TRUE, TRUE, 0);
+ gtk_label_set_justify (GTK_LABEL (label25), GTK_JUSTIFY_CENTER);
scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
***************
*** 232,236 ****
gtk_widget_show (label32);
gtk_box_pack_start (GTK_BOX (vbox2), label32, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label32, 51, -2);
gtk_label_set_line_wrap (GTK_LABEL (label32), TRUE);
--- 234,239 ----
gtk_widget_show (label32);
gtk_box_pack_start (GTK_BOX (vbox2), label32, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label32, 51, -1);
! gtk_label_set_justify (GTK_LABEL (label32), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label32), TRUE);
***************
*** 247,254 ****
gtk_box_pack_start (GTK_BOX (hbox4), vbox3, TRUE, TRUE, 0);
! label4 = gtk_label_new (_("Please select your harddisk,\nthis will launch a Linux partitioning tool.\n\nMake sure you have at least one Linux and one swap partition\n"));
gtk_widget_show (label4);
gtk_box_pack_start (GTK_BOX (vbox3), label4, FALSE, FALSE, 0);
gtk_widget_set_size_request (label4, 400, 200);
gtk_label_set_line_wrap (GTK_LABEL (label4), TRUE);
--- 250,258 ----
gtk_box_pack_start (GTK_BOX (hbox4), vbox3, TRUE, TRUE, 0);
! label4 = gtk_label_new (_("Please select your harddisk,\nthis will launch cfdisk, a partition tool for Linux. \nIt is console-based, but temporary.\n\nMake sure you have at least one Linux and one swap partition\n"));
gtk_widget_show (label4);
gtk_box_pack_start (GTK_BOX (vbox3), label4, FALSE, FALSE, 0);
gtk_widget_set_size_request (label4, 400, 200);
+ gtk_label_set_justify (GTK_LABEL (label4), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label4), TRUE);
***************
*** 267,270 ****
--- 271,275 ----
gtk_widget_show (label44);
gtk_box_pack_start (GTK_BOX (vbox3), label44, TRUE, TRUE, 0);
+ gtk_label_set_justify (GTK_LABEL (label44), GTK_JUSTIFY_CENTER);
dialog_action_area5 = GTK_DIALOG (SelectHarddisk)->action_area;
***************
*** 370,374 ****
gtk_widget_show (label33);
gtk_box_pack_start (GTK_BOX (vbox4), label33, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label33, 51, -2);
gtk_label_set_line_wrap (GTK_LABEL (label33), TRUE);
--- 375,380 ----
gtk_widget_show (label33);
gtk_box_pack_start (GTK_BOX (vbox4), label33, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label33, 51, -1);
! gtk_label_set_justify (GTK_LABEL (label33), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label33), TRUE);
***************
*** 389,392 ****
--- 395,399 ----
gtk_box_pack_start (GTK_BOX (vbox5), label5, FALSE, FALSE, 0);
gtk_widget_set_size_request (label5, 400, 200);
+ gtk_label_set_justify (GTK_LABEL (label5), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label5), TRUE);
***************
*** 464,468 ****
GtkWidget *vbox6;
GtkWidget *image5;
- GtkWidget *progressbar4;
GtkWidget *vseparator5;
GtkWidget *hbox8;
--- 471,474 ----
***************
*** 493,503 ****
gtk_box_pack_start (GTK_BOX (vbox6), image5, TRUE, TRUE, 0);
- progressbar4 = gtk_progress_bar_new ();
- gtk_widget_show (progressbar4);
- gtk_box_pack_start (GTK_BOX (vbox6), progressbar4, FALSE, FALSE, 0);
- gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR (progressbar4), GTK_PROGRESS_BOTTOM_TO_TOP);
- gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progressbar4), 0.05);
- gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar4), _("5%"));
-
vseparator5 = gtk_vseparator_new ();
gtk_widget_show (vseparator5);
--- 499,502 ----
***************
*** 516,519 ****
--- 515,519 ----
gtk_box_pack_start (GTK_BOX (vbox7), label6, FALSE, FALSE, 0);
gtk_widget_set_size_request (label6, 400, 200);
+ gtk_label_set_justify (GTK_LABEL (label6), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label6), TRUE);
gtk_misc_set_padding (GTK_MISC (label6), 28, 0);
***************
*** 546,550 ****
GLADE_HOOKUP_OBJECT (NoPart, vbox6, "vbox6");
GLADE_HOOKUP_OBJECT (NoPart, image5, "image5");
- GLADE_HOOKUP_OBJECT (NoPart, progressbar4, "progressbar4");
GLADE_HOOKUP_OBJECT (NoPart, vseparator5, "vseparator5");
GLADE_HOOKUP_OBJECT (NoPart, hbox8, "hbox8");
--- 546,549 ----
***************
*** 622,626 ****
gtk_widget_show (label34);
gtk_box_pack_start (GTK_BOX (vbox8), label34, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label34, 51, -2);
gtk_label_set_line_wrap (GTK_LABEL (label34), TRUE);
--- 621,626 ----
gtk_widget_show (label34);
gtk_box_pack_start (GTK_BOX (vbox8), label34, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label34, 51, -1);
! gtk_label_set_justify (GTK_LABEL (label34), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label34), TRUE);
***************
*** 641,644 ****
--- 641,645 ----
gtk_box_pack_start (GTK_BOX (vbox13), label9, FALSE, FALSE, 0);
gtk_widget_set_size_request (label9, 400, 100);
+ gtk_label_set_justify (GTK_LABEL (label9), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label9), TRUE);
gtk_misc_set_alignment (GTK_MISC (label9), 0, 0.75);
***************
*** 658,661 ****
--- 659,663 ----
gtk_box_pack_start (GTK_BOX (vbox13), label40, FALSE, FALSE, 0);
gtk_widget_set_size_request (label40, 400, 80);
+ gtk_label_set_justify (GTK_LABEL (label40), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label40), TRUE);
gtk_misc_set_alignment (GTK_MISC (label40), 0.5, 0.75);
***************
*** 721,731 ****
gtk_widget_show (label42);
gtk_box_pack_start (GTK_BOX (hbox33), label42, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label42), GTK_JUSTIFY_LEFT);
label41 = gtk_label_new (_("Next all changes will be made to your system.\nPlease make sure that you have entered all\ninformation correctly, if you have any doubt\nplease go back and correct your settings!"));
gtk_widget_show (label41);
gtk_box_pack_start (GTK_BOX (vbox13), label41, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label41, -2, 100);
! gtk_label_set_justify (GTK_LABEL (label41), GTK_JUSTIFY_LEFT);
dialog_action_area8 = GTK_DIALOG (SelectRoot)->action_area;
--- 723,731 ----
gtk_widget_show (label42);
gtk_box_pack_start (GTK_BOX (hbox33), label42, FALSE, FALSE, 0);
label41 = gtk_label_new (_("Next all changes will be made to your system.\nPlease make sure that you have entered all\ninformation correctly, if you have any doubt\nplease go back and correct your settings!"));
gtk_widget_show (label41);
gtk_box_pack_start (GTK_BOX (vbox13), label41, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label41, -1, 100);
dialog_action_area8 = GTK_DIALOG (SelectRoot)->action_area;
***************
*** 871,874 ****
--- 871,875 ----
gtk_box_pack_start (GTK_BOX (vbox16), label12, FALSE, FALSE, 0);
gtk_widget_set_size_request (label12, 400, 200);
+ gtk_label_set_justify (GTK_LABEL (label12), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label12), TRUE);
gtk_misc_set_padding (GTK_MISC (label12), 28, 0);
***************
*** 920,924 ****
GtkWidget *vbox18;
GtkWidget *image9;
- GtkWidget *progressbar8;
GtkWidget *vseparator9;
GtkWidget *hbox16;
--- 921,924 ----
***************
*** 948,958 ****
gtk_box_pack_start (GTK_BOX (vbox18), image9, TRUE, TRUE, 0);
- progressbar8 = gtk_progress_bar_new ();
- gtk_widget_show (progressbar8);
- gtk_box_pack_start (GTK_BOX (vbox18), progressbar8, FALSE, FALSE, 0);
- gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR (progressbar8), GTK_PROGRESS_BOTTOM_TO_TOP);
- gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progressbar8), 0.1);
- gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar8), _("10%"));
-
vseparator9 = gtk_vseparator_new ();
gtk_widget_show (vseparator9);
--- 948,951 ----
***************
*** 971,974 ****
--- 964,968 ----
gtk_box_pack_start (GTK_BOX (vbox19), label11, FALSE, FALSE, 0);
gtk_widget_set_size_request (label11, 400, 200);
+ gtk_label_set_justify (GTK_LABEL (label11), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label11), TRUE);
gtk_misc_set_padding (GTK_MISC (label11), 28, 0);
***************
*** 1001,1005 ****
GLADE_HOOKUP_OBJECT (NoRoot, vbox18, "vbox18");
GLADE_HOOKUP_OBJECT (NoRoot, image9, "image9");
- GLADE_HOOKUP_OBJECT (NoRoot, progressbar8, "progressbar8");
GLADE_HOOKUP_OBJECT (NoRoot, vseparator9, "vseparator9");
GLADE_HOOKUP_OBJECT (NoRoot, hbox16, "hbox16");
--- 995,998 ----
***************
*** 1014,1215 ****
GtkWidget*
- create_SelectFS (void)
- {
- GtkWidget *SelectFS;
- GtkWidget *vbox20;
- GtkWidget *hbox17;
- GtkWidget *vbox21;
- GtkWidget *image10;
- GtkWidget *label35;
- GtkWidget *vseparator10;
- GtkWidget *hbox18;
- GtkWidget *vbox22;
- GtkWidget *label13;
- GtkWidget *optionmenuFS;
- GtkWidget *menu2;
- GtkWidget *ext_2___standard_linux_filesystem1;
- GtkWidget *image23;
- GtkWidget *ext_3___journaling_file_system1;
- GtkWidget *image24;
- GtkWidget *reiserfs___journaling_file_system1;
- GtkWidget *image25;
- GtkWidget *xfs___journaling_file_system1;
- GtkWidget *image26;
- GtkWidget *label26;
- GtkWidget *hbuttonbox4;
- GtkWidget *helpbutton8;
- GtkWidget *button9;
- GtkWidget *button10;
- GtkTooltips *tooltips;
-
- tooltips = gtk_tooltips_new ();
-
- SelectFS = gtk_dialog_new ();
- gtk_widget_set_size_request (SelectFS, 640, 400);
- gtk_window_set_title (GTK_WINDOW (SelectFS), _("Morphix Install"));
- gtk_window_set_position (GTK_WINDOW (SelectFS), GTK_WIN_POS_CENTER);
- gtk_window_set_default_size (GTK_WINDOW (SelectFS), 640, 480);
-
- vbox20 = GTK_DIALOG (SelectFS)->vbox;
- gtk_widget_show (vbox20);
-
- hbox17 = gtk_hbox_new (FALSE, 0);
- gtk_widget_show (hbox17);
- gtk_box_pack_start (GTK_BOX (vbox20), hbox17, TRUE, TRUE, 0);
-
- vbox21 = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox21);
- gtk_box_pack_start (GTK_BOX (hbox17), vbox21, TRUE, TRUE, 0);
-
- image10 = create_pixmap (SelectFS, NULL);
- gtk_widget_show (image10);
- gtk_box_pack_start (GTK_BOX (vbox21), image10, TRUE, TRUE, 0);
-
- label35 = gtk_label_new (_("Filesystem selection\n\nStep:\n4 of 8"));
- gtk_widget_show (label35);
- gtk_box_pack_start (GTK_BOX (vbox21), label35, FALSE, FALSE, 0);
- gtk_widget_set_size_request (label35, 51, -2);
- gtk_label_set_line_wrap (GTK_LABEL (label35), TRUE);
-
- vseparator10 = gtk_vseparator_new ();
- gtk_widget_show (vseparator10);
- gtk_box_pack_start (GTK_BOX (hbox17), vseparator10, FALSE, FALSE, 0);
-
- hbox18 = gtk_hbox_new (FALSE, 0);
- gtk_widget_show (hbox18);
- gtk_box_pack_end (GTK_BOX (hbox17), hbox18, TRUE, FALSE, 0);
-
- vbox22 = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox22);
- gtk_box_pack_start (GTK_BOX (hbox18), vbox22, TRUE, TRUE, 0);
-
- label13 = gtk_label_new (_("Please select the filesystem type,\nthe recommended setting has been selected:\n"));
- gtk_widget_show (label13);
- gtk_box_pack_start (GTK_BOX (vbox22), label13, FALSE, FALSE, 0);
- gtk_widget_set_size_request (label13, 400, 200);
- gtk_label_set_line_wrap (GTK_LABEL (label13), TRUE);
-
- optionmenuFS = gtk_option_menu_new ();
- gtk_widget_show (optionmenuFS);
- gtk_box_pack_start (GTK_BOX (vbox22), optionmenuFS, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, optionmenuFS, _("A list of available filesystems, if you are unsure choose the default \"ext3\""), NULL);
-
- menu2 = gtk_menu_new ();
-
- ext_2___standard_linux_filesystem1 = gtk_image_menu_item_new_with_mnemonic (_("Ext 2 - Standard Linux Filesystem"));
- gtk_widget_show (ext_2___standard_linux_filesystem1);
- gtk_container_add (GTK_CONTAINER (menu2), ext_2___standard_linux_filesystem1);
-
- image23 = gtk_image_new_from_stock ("gtk-yes", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image23);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (ext_2___standard_linux_filesystem1), image23);
-
- ext_3___journaling_file_system1 = gtk_image_menu_item_new_with_mnemonic (_("Ext 3 - Journaling File System"));
- gtk_widget_show (ext_3___journaling_file_system1);
- gtk_container_add (GTK_CONTAINER (menu2), ext_3___journaling_file_system1);
-
- image24 = gtk_image_new_from_stock ("gtk-yes", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image24);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (ext_3___journaling_file_system1), image24);
-
- reiserfs___journaling_file_system1 = gtk_image_menu_item_new_with_mnemonic (_("ReiserFS - Journaling File System"));
- gtk_widget_show (reiserfs___journaling_file_system1);
- gtk_container_add (GTK_CONTAINER (menu2), reiserfs___journaling_file_system1);
-
- image25 = gtk_image_new_from_stock ("gtk-yes", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image25);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (reiserfs___journaling_file_system1), image25);
-
- xfs___journaling_file_system1 = gtk_image_menu_item_new_with_mnemonic (_("XFS - Journaling File System"));
- gtk_widget_show (xfs___journaling_file_system1);
- gtk_container_add (GTK_CONTAINER (menu2), xfs___journaling_file_system1);
-
- image26 = gtk_image_new_from_stock ("gtk-yes", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image26);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (xfs___journaling_file_system1), image26);
-
- gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenuFS), menu2);
-
- label26 = gtk_label_new (_("Next all changes will be made to your system.\nPlease make sure that you have entered all\ninformation correctly, if you have any doubt\nplease go back and correct your settings!"));
- gtk_widget_show (label26);
- gtk_box_pack_end (GTK_BOX (vbox22), label26, TRUE, TRUE, 0);
- gtk_label_set_justify (GTK_LABEL (label26), GTK_JUSTIFY_LEFT);
-
- hbuttonbox4 = GTK_DIALOG (SelectFS)->action_area;
- gtk_widget_show (hbuttonbox4);
- gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox4), GTK_BUTTONBOX_END);
-
- helpbutton8 = gtk_button_new_from_stock ("gtk-help");
- gtk_widget_show (helpbutton8);
- gtk_dialog_add_action_widget (GTK_DIALOG (SelectFS), helpbutton8, GTK_RESPONSE_HELP);
- GTK_WIDGET_SET_FLAGS (helpbutton8, GTK_CAN_DEFAULT);
-
- button9 = gtk_button_new_from_stock ("gtk-go-back");
- gtk_widget_show (button9);
- gtk_dialog_add_action_widget (GTK_DIALOG (SelectFS), button9, GTK_RESPONSE_CANCEL);
- GTK_WIDGET_SET_FLAGS (button9, GTK_CAN_DEFAULT);
-
- button10 = gtk_button_new_from_stock ("gtk-go-forward");
- gtk_widget_show (button10);
- gtk_dialog_add_action_widget (GTK_DIALOG (SelectFS), button10, GTK_RESPONSE_OK);
- GTK_WIDGET_SET_FLAGS (button10, GTK_CAN_DEFAULT);
-
- g_signal_connect_swapped ((gpointer) SelectFS, "realize",
- G_CALLBACK (on_SelectFS_realize),
- GTK_OBJECT (optionmenuFS));
- g_signal_connect_swapped ((gpointer) optionmenuFS, "realize",
- G_CALLBACK (on_optionmenuFS_realize),
- GTK_OBJECT (optionmenuFS));
- g_signal_connect ((gpointer) ext_2___standard_linux_filesystem1, "activate",
- G_CALLBACK (on_ext_2___standard_linux_filesystem1_activate),
- NULL);
- g_signal_connect ((gpointer) ext_3___journaling_file_system1, "activate",
- G_CALLBACK (on_ext_3___journaling_file_system1_activate),
- NULL);
- g_signal_connect ((gpointer) reiserfs___journaling_file_system1, "activate",
- G_CALLBACK (on_reiserfs___journaling_file_system1_activate),
- NULL);
- g_signal_connect ((gpointer) xfs___journaling_file_system1, "activate",
- G_CALLBACK (on_xfs___journaling_file_system1_activate),
- NULL);
- g_signal_connect ((gpointer) helpbutton8, "clicked",
- G_CALLBACK (on_helpbutton_clicked),
- NULL);
- g_signal_connect ((gpointer) button9, "clicked",
- G_CALLBACK (on_cancelFS_clicked),
- NULL);
-
- /* Store pointers to all widgets, for use by lookup_widget(). */
- GLADE_HOOKUP_OBJECT_NO_REF (SelectFS, SelectFS, "SelectFS");
- GLADE_HOOKUP_OBJECT_NO_REF (SelectFS, vbox20, "vbox20");
- GLADE_HOOKUP_OBJECT (SelectFS, hbox17, "hbox17");
- GLADE_HOOKUP_OBJECT (SelectFS, vbox21, "vbox21");
- GLADE_HOOKUP_OBJECT (SelectFS, image10, "image10");
- GLADE_HOOKUP_OBJECT (SelectFS, label35, "label35");
- GLADE_HOOKUP_OBJECT (SelectFS, vseparator10, "vseparator10");
- GLADE_HOOKUP_OBJECT (SelectFS, hbox18, "hbox18");
- GLADE_HOOKUP_OBJECT (SelectFS, vbox22, "vbox22");
- GLADE_HOOKUP_OBJECT (SelectFS, label13, "label13");
- GLADE_HOOKUP_OBJECT (SelectFS, optionmenuFS, "optionmenuFS");
- GLADE_HOOKUP_OBJECT (SelectFS, menu2, "menu2");
- GLADE_HOOKUP_OBJECT (SelectFS, ext_2___standard_linux_filesystem1, "ext_2___standard_linux_filesystem1");
- GLADE_HOOKUP_OBJECT (SelectFS, image23, "image23");
- GLADE_HOOKUP_OBJECT (SelectFS, ext_3___journaling_file_system1, "ext_3___journaling_file_system1");
- GLADE_HOOKUP_OBJECT (SelectFS, image24, "image24");
- GLADE_HOOKUP_OBJECT (SelectFS, reiserfs___journaling_file_system1, "reiserfs___journaling_file_system1");
- GLADE_HOOKUP_OBJECT (SelectFS, image25, "image25");
- GLADE_HOOKUP_OBJECT (SelectFS, xfs___journaling_file_system1, "xfs___journaling_file_system1");
- GLADE_HOOKUP_OBJECT (SelectFS, image26, "image26");
- GLADE_HOOKUP_OBJECT (SelectFS, label26, "label26");
- GLADE_HOOKUP_OBJECT_NO_REF (SelectFS, hbuttonbox4, "hbuttonbox4");
- GLADE_HOOKUP_OBJECT (SelectFS, helpbutton8, "helpbutton8");
- GLADE_HOOKUP_OBJECT (SelectFS, button9, "button9");
- GLADE_HOOKUP_OBJECT (SelectFS, button10, "button10");
- GLADE_HOOKUP_OBJECT_NO_REF (SelectFS, tooltips, "tooltips");
-
- return SelectFS;
- }
-
- GtkWidget*
create_DoFilesystem (void)
{
--- 1007,1010 ----
***************
*** 1233,1236 ****
--- 1028,1032 ----
gtk_widget_show (label14);
gtk_box_pack_start (GTK_BOX (vbox23), label14, TRUE, TRUE, 0);
+ gtk_label_set_justify (GTK_LABEL (label14), GTK_JUSTIFY_CENTER);
progressbar10 = gtk_progress_bar_new ();
***************
*** 1273,1276 ****
--- 1069,1073 ----
gtk_widget_show (label15);
gtk_box_pack_start (GTK_BOX (vbox24), label15, TRUE, TRUE, 0);
+ gtk_label_set_justify (GTK_LABEL (label15), GTK_JUSTIFY_CENTER);
progressbar11 = gtk_progress_bar_new ();
***************
*** 1336,1340 ****
gtk_widget_show (label36);
gtk_box_pack_start (GTK_BOX (vbox29), label36, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label36, 51, -2);
gtk_label_set_line_wrap (GTK_LABEL (label36), TRUE);
--- 1133,1138 ----
gtk_widget_show (label36);
gtk_box_pack_start (GTK_BOX (vbox29), label36, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label36, 51, -1);
! gtk_label_set_justify (GTK_LABEL (label36), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label36), TRUE);
***************
*** 1355,1358 ****
--- 1153,1157 ----
gtk_box_pack_start (GTK_BOX (vbox30), label17, FALSE, FALSE, 0);
gtk_widget_set_size_request (label17, 400, 200);
+ gtk_label_set_justify (GTK_LABEL (label17), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label17), TRUE);
***************
*** 1451,1455 ****
gtk_widget_show (label37);
gtk_box_pack_start (GTK_BOX (vbox32), label37, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label37, 51, -2);
gtk_label_set_line_wrap (GTK_LABEL (label37), TRUE);
--- 1250,1255 ----
gtk_widget_show (label37);
gtk_box_pack_start (GTK_BOX (vbox32), label37, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label37, 51, -1);
! gtk_label_set_justify (GTK_LABEL (label37), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label37), TRUE);
***************
*** 1470,1473 ****
--- 1270,1274 ----
gtk_box_pack_start (GTK_BOX (vbox33), label18, FALSE, FALSE, 0);
gtk_widget_set_size_request (label18, 400, 200);
+ gtk_label_set_justify (GTK_LABEL (label18), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label18), TRUE);
***************
*** 1475,1479 ****
gtk_widget_show (label27);
gtk_box_pack_start (GTK_BOX (vbox33), label27, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label27), GTK_JUSTIFY_LEFT);
entryRoot1 = gtk_entry_new ();
--- 1276,1279 ----
***************
*** 1485,1489 ****
gtk_widget_show (label28);
gtk_box_pack_start (GTK_BOX (vbox33), label28, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label28), GTK_JUSTIFY_LEFT);
entryRoot2 = gtk_entry_new ();
--- 1285,1288 ----
***************
*** 1495,1498 ****
--- 1294,1298 ----
gtk_widget_show (labelRootPassError);
gtk_box_pack_start (GTK_BOX (vbox33), labelRootPassError, FALSE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (labelRootPassError), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (labelRootPassError), TRUE);
***************
*** 1601,1605 ****
gtk_widget_show (label38);
gtk_box_pack_start (GTK_BOX (vbox35), label38, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label38, 51, -2);
gtk_label_set_line_wrap (GTK_LABEL (label38), TRUE);
--- 1401,1406 ----
gtk_widget_show (label38);
gtk_box_pack_start (GTK_BOX (vbox35), label38, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label38, 51, -1);
! gtk_label_set_justify (GTK_LABEL (label38), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label38), TRUE);
***************
*** 1620,1623 ****
--- 1421,1425 ----
gtk_box_pack_start (GTK_BOX (vbox36), label19, FALSE, FALSE, 0);
gtk_widget_set_size_request (label19, 400, 115);
+ gtk_label_set_justify (GTK_LABEL (label19), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label19), TRUE);
gtk_misc_set_padding (GTK_MISC (label19), 8, 0);
***************
*** 1626,1630 ****
gtk_widget_show (label20);
gtk_box_pack_start (GTK_BOX (vbox36), label20, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label20), GTK_JUSTIFY_LEFT);
entryUser = gtk_entry_new ();
--- 1428,1431 ----
***************
*** 1637,1641 ****
gtk_widget_show (label21);
gtk_box_pack_start (GTK_BOX (vbox36), label21, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label21), GTK_JUSTIFY_LEFT);
entryUserPass1 = gtk_entry_new ();
--- 1438,1441 ----
***************
*** 1652,1656 ****
gtk_widget_show (labelUserPassError);
gtk_box_pack_start (GTK_BOX (vbox36), labelUserPassError, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (labelUserPassError), GTK_JUSTIFY_LEFT);
hbuttonbox8 = GTK_DIALOG (EnterUser)->action_area;
--- 1452,1455 ----
***************
*** 1767,1771 ****
gtk_widget_show (label39);
gtk_box_pack_start (GTK_BOX (vbox38), label39, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label39, 51, -2);
gtk_label_set_line_wrap (GTK_LABEL (label39), TRUE);
--- 1566,1571 ----
gtk_widget_show (label39);
gtk_box_pack_start (GTK_BOX (vbox38), label39, FALSE, FALSE, 0);
! gtk_widget_set_size_request (label39, 51, -1);
! gtk_label_set_justify (GTK_LABEL (label39), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label39), TRUE);
***************
*** 1786,1789 ****
--- 1586,1590 ----
gtk_box_pack_start (GTK_BOX (vbox39), label22, FALSE, FALSE, 0);
gtk_widget_set_size_request (label22, 400, 200);
+ gtk_label_set_justify (GTK_LABEL (label22), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label22), TRUE);
***************
*** 1804,1808 ****
"GladeParentKey", LiloHarddiskCombo);
gtk_box_pack_start (GTK_BOX (hbox31), LiloHarddiskCombo, TRUE, TRUE, 0);
! gtk_widget_set_size_request (LiloHarddiskCombo, 70, -2);
combo_entry4 = GTK_COMBO (LiloHarddiskCombo)->entry;
--- 1605,1609 ----
"GladeParentKey", LiloHarddiskCombo);
gtk_box_pack_start (GTK_BOX (hbox31), LiloHarddiskCombo, TRUE, TRUE, 0);
! gtk_widget_set_size_request (LiloHarddiskCombo, 70, -1);
combo_entry4 = GTK_COMBO (LiloHarddiskCombo)->entry;
***************
*** 1967,1970 ****
--- 1768,1772 ----
gtk_box_pack_end (GTK_BOX (vbox42), label23, TRUE, TRUE, 0);
gtk_widget_set_size_request (label23, 400, 200);
+ gtk_label_set_justify (GTK_LABEL (label23), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label23), TRUE);
***************
*** 2029,2032 ****
--- 1831,1835 ----
gtk_widget_show (label24);
gtk_box_pack_start (GTK_BOX (vbox43), label24, TRUE, TRUE, 0);
+ gtk_label_set_justify (GTK_LABEL (label24), GTK_JUSTIFY_CENTER);
progressbar18 = gtk_progress_bar_new ();
***************
*** 2074,2082 ****
gtk_widget_show (label31);
gtk_box_pack_start (GTK_BOX (vbox46), label31, TRUE, TRUE, 0);
ErrorLabelText = gtk_label_new ("");
gtk_widget_show (ErrorLabelText);
gtk_box_pack_end (GTK_BOX (vbox46), ErrorLabelText, TRUE, TRUE, 0);
- gtk_label_set_justify (GTK_LABEL (ErrorLabelText), GTK_JUSTIFY_LEFT);
hbuttonbox11 = GTK_DIALOG (ErrorLabel)->action_area;
--- 1877,1885 ----
gtk_widget_show (label31);
gtk_box_pack_start (GTK_BOX (vbox46), label31, TRUE, TRUE, 0);
+ gtk_label_set_justify (GTK_LABEL (label31), GTK_JUSTIFY_CENTER);
ErrorLabelText = gtk_label_new ("");
gtk_widget_show (ErrorLabelText);
gtk_box_pack_end (GTK_BOX (vbox46), ErrorLabelText, TRUE, TRUE, 0);
hbuttonbox11 = GTK_DIALOG (ErrorLabel)->action_area;
***************
*** 2243,2246 ****
--- 2046,2050 ----
gtk_widget_show (label43);
gtk_box_pack_start (GTK_BOX (vbox47), label43, TRUE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (label43), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label43), TRUE);
Index: interface.h
===================================================================
RCS file: /cvsroot/morphix/morphixinstaller/src/interface.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** interface.h 21 May 2003 23:51:36 -0000 1.3
--- interface.h 3 Jan 2004 21:59:57 -0000 1.4
***************
*** 11,15 ****
GtkWidget* create_SmallRoot (void);
GtkWidget* create_NoRoot (void);
- GtkWidget* create_SelectFS (void);
GtkWidget* create_DoFilesystem (void);
GtkWidget* create_DoInstall (void);
--- 11,14 ----
|
|
From: <ale...@us...> - 2004-01-03 22:00:03
|
Update of /cvsroot/morphix/morphixinstaller
In directory sc8-pr-cvs1:/tmp/cvs-serv24467
Modified Files:
morphixinstaller.glade trans.c
Log Message:
removed some old gui code
Index: morphixinstaller.glade
===================================================================
RCS file: /cvsroot/morphix/morphixinstaller/morphixinstaller.glade,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** morphixinstaller.glade 24 Sep 2003 23:23:02 -0000 1.10
--- morphixinstaller.glade 3 Jan 2004 21:59:55 -0000 1.11
***************
*** 900,915 ****
<child>
! <widget class="GtkProgressBar" id="progressbar4">
! <property name="visible">True</property>
! <property name="orientation">GTK_PROGRESS_BOTTOM_TO_TOP</property>
! <property name="fraction">0.05</property>
! <property name="pulse_step">0.1</property>
! <property name="text" translatable="yes">5%</property>
! </widget>
! <packing>
! <property name="padding">0</property>
! <property name="expand">False</property>
! <property name="fill">False</property>
! </packing>
</child>
</widget>
--- 900,904 ----
<child>
! <placeholder/>
</child>
</widget>
***************
*** 1728,1743 ****
<child>
! <widget class="GtkProgressBar" id="progressbar8">
! <property name="visible">True</property>
! <property name="orientation">GTK_PROGRESS_BOTTOM_TO_TOP</property>
! <property name="fraction">0.1</property>
! <property name="pulse_step">0.1</property>
! <property name="text" translatable="yes">10%</property>
! </widget>
! <packing>
! <property name="padding">0</property>
! <property name="expand">False</property>
! <property name="fill">False</property>
! </packing>
</child>
</widget>
--- 1717,1721 ----
<child>
! <placeholder/>
</child>
</widget>
***************
*** 1797,2137 ****
<property name="expand">False</property>
<property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
-
- <widget class="GtkDialog" id="SelectFS">
- <property name="width_request">640</property>
- <property name="height_request">400</property>
- <property name="visible">True</property>
- <property name="title" translatable="yes">Morphix Install</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_CENTER</property>
- <property name="modal">False</property>
- <property name="default_width">640</property>
- <property name="default_height">480</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="has_separator">True</property>
- <signal name="realize" handler="on_SelectFS_realize" object="optionmenuFS" last_modification_time="Thu, 06 Feb 2003 22:39:30 GMT"/>
-
- <child internal-child="vbox">
- <widget class="GtkVBox" id="vbox20">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="hbuttonbox4">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
-
- <child>
- <widget class="GtkButton" id="helpbutton8">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-help</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="response_id">-11</property>
- <signal name="clicked" handler="on_helpbutton_clicked" last_modification_time="Fri, 31 Jan 2003 22:57:00 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="button9">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-go-back</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="response_id">-6</property>
- <signal name="clicked" handler="on_cancelFS_clicked" last_modification_time="Fri, 31 Jan 2003 22:57:25 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="button10">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-go-forward</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="response_id">-5</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox17">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkVBox" id="vbox21">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkImage" id="image10">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label35">
- <property name="width_request">51</property>
- <property name="visible">True</property>
- <property name="label" translatable="yes">Filesystem selection
-
- Step:
- 4 of 8</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">True</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVSeparator" id="vseparator10">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox18">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkVBox" id="vbox22">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="label13">
- <property name="width_request">400</property>
- <property name="height_request">200</property>
- <property name="visible">True</property>
- <property name="label" translatable="yes">Please select the filesystem type,
- the recommended setting has been selected:
- </property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">True</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkOptionMenu" id="optionmenuFS">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">A list of available filesystems, if you are unsure choose the default "ext3"</property>
- <property name="can_focus">True</property>
- <property name="history">0</property>
- <signal name="realize" handler="on_optionmenuFS_realize" object="optionmenuFS" last_modification_time="Sat, 01 Feb 2003 00:08:03 GMT"/>
-
- <child>
- <widget class="GtkMenu" id="menu2">
-
- <child>
- <widget class="GtkImageMenuItem" id="ext_2_-_standard_linux_filesystem1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ext 2 - Standard Linux Filesystem</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_ext_2_-_standard_linux_filesystem1_activate" last_modification_time="Sat, 01 Feb 2003 02:08:10 GMT"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image23">
- <property name="visible">True</property>
- <property name="stock">gtk-yes</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkImageMenuItem" id="ext_3_-_journaling_file_system1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ext 3 - Journaling File System</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_ext_3_-_journaling_file_system1_activate" last_modification_time="Sat, 01 Feb 2003 02:08:10 GMT"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image24">
- <property name="visible">True</property>
- <property name="stock">gtk-yes</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkImageMenuItem" id="reiserfs_-_journaling_file_system1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">ReiserFS - Journaling File System</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_reiserfs_-_journaling_file_system1_activate" last_modification_time="Sat, 01 Feb 2003 02:08:10 GMT"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image25">
- <property name="visible">True</property>
- <property name="stock">gtk-yes</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkImageMenuItem" id="xfs_-_journaling_file_system1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">XFS - Journaling File System</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_xfs_-_journaling_file_system1_activate" last_modification_time="Sat, 01 Feb 2003 02:08:10 GMT"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image26">
- <property name="visible">True</property>
- <property name="stock">gtk-yes</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label26">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Next all changes will be made to your system.
- Please make sure that you have entered all
- information correctly, if you have any doubt
- please go back and correct your settings!</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
</packing>
</child>
--- 1775,1778 ----
Index: trans.c
===================================================================
RCS file: /cvsroot/morphix/morphixinstaller/trans.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** trans.c 24 Sep 2003 23:23:03 -0000 1.10
--- trans.c 3 Jan 2004 21:59:57 -0000 1.11
***************
*** 49,53 ****
gchar *s = N_("*");
gchar *s = N_("Morphix Install");
- gchar *s = N_("5%");
gchar *s = N_("Couldn't find a Linux partition\n"
"on the selected harddisk.\n"
--- 49,52 ----
***************
*** 85,89 ****
"partition is bigger than X MB");
gchar *s = N_("Morphix Install");
- gchar *s = N_("10%");
gchar *s = N_("Couldn't find a Linux partition\n"
"on the selected harddisk.\n"
--- 84,87 ----
***************
*** 92,112 ****
"or add a Linux partition to the harddisk.\n"
"");
- gchar *s = N_("Morphix Install");
- gchar *s = N_("Filesystem selection\n"
- "\n"
- "Step:\n"
- "4 of 8");
- gchar *s = N_("Please select the filesystem type,\n"
- "the recommended setting has been selected:\n"
- "");
- gchar *s = N_("A list of available filesystems, if you are unsure choose the default \"ext3\"");
- gchar *s = N_("Ext 2 - Standard Linux Filesystem");
- gchar *s = N_("Ext 3 - Journaling File System");
- gchar *s = N_("ReiserFS - Journaling File System");
- gchar *s = N_("XFS - Journaling File System");
- gchar *s = N_("Next all changes will be made to your system.\n"
- "Please make sure that you have entered all\n"
- "information correctly, if you have any doubt\n"
- "please go back and correct your settings!");
gchar *s = N_("Processing...");
gchar *s = N_("Creating filesystem, please wait...");
--- 90,93 ----
|
|
From: <ale...@us...> - 2004-01-03 21:59:47
|
Update of /cvsroot/morphix/morphixinstaller/po In directory sc8-pr-cvs1:/tmp/cvs-serv24345 Modified Files: morphixinstaller.pot Log Message: updating pot Index: morphixinstaller.pot =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/po/morphixinstaller.pot,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** morphixinstaller.pot 27 Dec 2003 15:40:30 -0000 1.1 --- morphixinstaller.pot 3 Jan 2004 21:59:07 -0000 1.2 *************** *** 5,505 **** # #, fuzzy ! msgid "" ! msgstr "Project-Id-Version: PACKAGE VERSION\n" ! "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2003-12-27 16:39+0100\n" ! "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" ! "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" ! "Language-Team: LANGUAGE <LL...@li...>\n" ! "MIME-Version: 1.0\n" [...983 lines suppressed...] ! #: src/interface.c:2159 src/interface.c:2175 src/interface.c:2195 ! #: src/interface.c:2212 ! msgid "/boot" ! msgstr "" ! #: src/interface.c:2160 src/interface.c:2177 src/interface.c:2193 ! #: src/interface.c:2213 ! msgid "/usr" ! msgstr "" ! #: src/interface.c:2161 src/interface.c:2178 src/interface.c:2196 ! #: src/interface.c:2210 ! msgid "/var" ! msgstr "" ! #: src/support.c:90 src/support.c:114 #, c-format ! msgid "Couldn't find pixmap file: %s" ! msgstr "" |
|
From: <ale...@us...> - 2004-01-03 17:16:59
|
Update of /cvsroot/morphix/langconf In directory sc8-pr-cvs1:/tmp/cvs-serv9612 Modified Files: Makefile.am Log Message: changed $$lists to $$list Index: Makefile.am =================================================================== RCS file: /cvsroot/morphix/langconf/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 11 Dec 2003 14:21:50 -0000 1.3 --- Makefile.am 3 Jan 2004 17:16:51 -0000 1.4 *************** *** 21,26 **** $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/lists; \ for list in $(srcdir)/lists/*; do \ ! if test -f $$lists; then \ ! $(INSTALL_DATA) $$lists $(DESTDIR)$(pkgdatadir)/lists; \ fi \ done \ --- 21,26 ---- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/lists; \ for list in $(srcdir)/lists/*; do \ ! if test -f $$list; then \ ! $(INSTALL_DATA) $$list $(DESTDIR)$(pkgdatadir)/lists; \ fi \ done \ |
|
From: <ale...@us...> - 2004-01-03 17:16:18
|
Update of /cvsroot/morphix/mcp2/data In directory sc8-pr-cvs1:/tmp/cvs-serv9516 Modified Files: mcp-main.xml Log Message: changed pixmap path Index: mcp-main.xml =================================================================== RCS file: /cvsroot/morphix/mcp2/data/mcp-main.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mcp-main.xml 3 Jan 2004 16:35:51 -0000 1.6 --- mcp-main.xml 3 Jan 2004 17:16:11 -0000 1.7 *************** *** 57,61 **** <name>Add/Remove Software</name> <tip>Add/Remove Software</tip> ! <icon>/usr/local/share/mcp/pixmaps/Synaptic.png</icon> </item> </mcp> --- 57,61 ---- <name>Add/Remove Software</name> <tip>Add/Remove Software</tip> ! <icon>/usr/share/mcp/pixmaps/Synaptic.png</icon> </item> </mcp> |
|
From: <ale...@us...> - 2004-01-03 16:35:55
|
Update of /cvsroot/morphix/mcp2/data In directory sc8-pr-cvs1:/tmp/cvs-serv2546 Modified Files: help.xml mcp-main.xml Log Message: updating for debian package Index: help.xml =================================================================== RCS file: /cvsroot/morphix/mcp2/data/help.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** help.xml 9 Dec 2003 22:42:13 -0000 1.1 --- help.xml 3 Jan 2004 16:35:51 -0000 1.2 *************** *** 8,12 **** <name>Morphix website</name> <tip>Check out the FAQ and fora for answers</tip> ! <icon>../morphix.png</icon> </item> </mcp> --- 8,12 ---- <name>Morphix website</name> <tip>Check out the FAQ and fora for answers</tip> ! <icon>/usr/share/mcp/pixmaps/mcp.png</icon> </item> </mcp> Index: mcp-main.xml =================================================================== RCS file: /cvsroot/morphix/mcp2/data/mcp-main.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mcp-main.xml 11 Dec 2003 16:31:55 -0000 1.5 --- mcp-main.xml 3 Jan 2004 16:35:51 -0000 1.6 *************** *** 7,11 **** <name>Xwindow settings</name> <tip>Helps you set your X settings</tip> ! <icon>/usr/local/share/mcp/pixmaps/Monitor.png</icon> </item> <item> --- 7,11 ---- <name>Xwindow settings</name> <tip>Helps you set your X settings</tip> ! <icon>/usr/share/mcp/pixmaps/Monitor.png</icon> </item> <item> *************** *** 13,17 **** <name>Network</name> <tip>Helps you set your network settings</tip> ! <icon>/usr/local/share/mcp/pixmaps/Networking.png</icon> </item> <item> --- 13,17 ---- <name>Network</name> <tip>Helps you set your network settings</tip> ! <icon>/usr/share/mcp/pixmaps/Networking.png</icon> </item> <item> *************** *** 19,23 **** <name>Partition Morpher</name> <tip>Helps you partition your harddisk</tip> ! <icon>/usr/local/share/mcp/pixmaps/PM.png</icon> </item> --- 19,23 ---- <name>Partition Morpher</name> <tip>Helps you partition your harddisk</tip> ! <icon>/usr/share/mcp/pixmaps/PM.png</icon> </item> *************** *** 26,30 **** <name>Keyboard</name> <tip>Helps you set your keyboard settings</tip> ! <icon>/usr/local/share/mcp/pixmaps/Keyboard.png</icon> </item> <item> --- 26,30 ---- <name>Keyboard</name> <tip>Helps you set your keyboard settings</tip> ! <icon>/usr/share/mcp/pixmaps/Keyboard.png</icon> </item> <item> *************** *** 32,36 **** <name>Harddisk Install</name> <tip>Copy Morphix to the harddisk for usage without CD</tip> ! <icon>/usr/local/share/mcp/pixmaps/Harddisk.png</icon> </item> --- 32,36 ---- <name>Harddisk Install</name> <tip>Copy Morphix to the harddisk for usage without CD</tip> ! <icon>/usr/share/mcp/pixmaps/Harddisk.png</icon> </item> *************** *** 39,43 **** <name>Root Xterminal</name> <tip>Open a root terminal</tip> ! <icon>/usr/local/share/mcp/pixmaps/BabyTuxTerm.png</icon> </item> <item> --- 39,43 ---- <name>Root Xterminal</name> <tip>Open a root terminal</tip> ! <icon>/usr/share/mcp/pixmaps/BabyTuxTerm.png</icon> </item> <item> *************** *** 45,49 **** <name>Language</name> <tip>For setting the locale</tip> ! <icon>/usr/local/share/mcp/pixmaps/Localeconf.png</icon> </item> <item> --- 45,49 ---- <name>Language</name> <tip>For setting the locale</tip> ! <icon>/usr/share/mcp/pixmaps/Localeconf.png</icon> </item> <item> *************** *** 51,55 **** <name>Date&Time</name> <tip>Set the Date, Time and/or timezone</tip> ! <icon>/usr/local/share/mcp/pixmaps/Datetime.png</icon> </item> <item> --- 51,55 ---- <name>Date&Time</name> <tip>Set the Date, Time and/or timezone</tip> ! <icon>/usr/share/mcp/pixmaps/Datetime.png</icon> </item> <item> |
|
From: <ale...@us...> - 2004-01-03 16:29:14
|
Update of /cvsroot/morphix/mcp2/pixmaps In directory sc8-pr-cvs1:/tmp/cvs-serv1489 Added Files: PM.png Synaptic.png mcp.png Log Message: adding pixmaps --- NEW FILE: PM.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Synaptic.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mcp.png --- (This appears to be a binary file; contents omitted.) |
|
From: <ale...@us...> - 2004-01-03 15:51:40
|
Update of /cvsroot/morphix/datetimeconf/debian In directory sc8-pr-cvs1:/tmp/cvs-serv27557/debian Modified Files: copyright Log Message: adding copyright info Index: copyright =================================================================== RCS file: /cvsroot/morphix/datetimeconf/debian/copyright,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** copyright 3 Jan 2004 15:33:17 -0000 1.1 --- copyright 3 Jan 2004 15:51:29 -0000 1.2 *************** *** 1,10 **** ! This package was debianized by Morphix User <lala@myBox> on ! Sat, 3 Jan 2004 16:12:46 +0000. ! It was downloaded from <fill in ftp site> - Upstream Author(s): <put author(s) name and email here> - Copyright: - <Must follow here> --- 1,28 ---- ! This package was debianized by Alex de Landgraaf <ale...@xs...> on ! Sat, 3 Jan 2004 14:58:44 +0000. ! It was downloaded from http://www.morphix.org ! ! Upstream Author(s): Alex de Landgraaf <ale...@xs...> and a few contributers ! ! Copyright (C) 2003-2004 Alex de Landgraaf ! ! This program is free software; you can redistribute it and/or modify ! it under the terms of the GNU General Public License as published by ! the Free Software Foundation; either version 2, or (at your option) ! any later version. ! ! This program is distributed in the hope that it will be useful, ! but WITHOUT ANY WARRANTY; without even the implied warranty of ! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! GNU General Public License for more details. ! ! You should have received a copy of the GNU General Public License ! along with this program; if not, write to the Free Software Foundation, ! Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ! ! On Debian GNU/Linux systems, the complete text of the GNU General ! Public License can be found in `/usr/share/common-licenses/GPL'. |
|
From: <ale...@us...> - 2004-01-03 15:51:18
|
Update of /cvsroot/morphix/keybconf/debian In directory sc8-pr-cvs1:/tmp/cvs-serv27531/debian Modified Files: copyright Log Message: adding copyright info Index: copyright =================================================================== RCS file: /cvsroot/morphix/keybconf/debian/copyright,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** copyright 3 Jan 2004 15:26:08 -0000 1.1 --- copyright 3 Jan 2004 15:51:09 -0000 1.2 *************** *** 1,10 **** ! This package was debianized by Morphix User <lala@myBox> on ! Sat, 3 Jan 2004 16:03:28 +0000. ! It was downloaded from <fill in ftp site> - Upstream Author(s): <put author(s) name and email here> - Copyright: - <Must follow here> --- 1,28 ---- ! This package was debianized by Alex de Landgraaf <ale...@xs...> on ! Sat, 3 Jan 2004 14:58:44 +0000. ! It was downloaded from http://www.morphix.org ! ! Upstream Author(s): Alex de Landgraaf <ale...@xs...> and a few contributers ! ! Copyright (C) 2003-2004 Alex de Landgraaf ! ! This program is free software; you can redistribute it and/or modify ! it under the terms of the GNU General Public License as published by ! the Free Software Foundation; either version 2, or (at your option) ! any later version. ! ! This program is distributed in the hope that it will be useful, ! but WITHOUT ANY WARRANTY; without even the implied warranty of ! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! GNU General Public License for more details. ! ! You should have received a copy of the GNU General Public License ! along with this program; if not, write to the Free Software Foundation, ! Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ! ! On Debian GNU/Linux systems, the complete text of the GNU General ! Public License can be found in `/usr/share/common-licenses/GPL'. |
|
From: <ale...@us...> - 2004-01-03 15:51:03
|
Update of /cvsroot/morphix/langconf/debian In directory sc8-pr-cvs1:/tmp/cvs-serv27468/debian Added Files: copyright Log Message: adding copyright info --- NEW FILE: copyright --- This package was debianized by Alex de Landgraaf <ale...@xs...> on Sat, 3 Jan 2004 14:58:44 +0000. It was downloaded from http://www.morphix.org Upstream Author(s): Alex de Landgraaf <ale...@xs...> and a few contributers Copyright (C) 2003-2004 Alex de Landgraaf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. On Debian GNU/Linux systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. |
|
From: <ale...@us...> - 2004-01-03 15:50:36
|
Update of /cvsroot/morphix/mcp2/debian In directory sc8-pr-cvs1:/tmp/cvs-serv27418/debian Modified Files: copyright Log Message: adding copyright info Index: copyright =================================================================== RCS file: /cvsroot/morphix/mcp2/debian/copyright,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** copyright 3 Jan 2004 15:02:18 -0000 1.1 --- copyright 3 Jan 2004 15:50:28 -0000 1.2 *************** *** 1,10 **** ! This package was debianized by Morphix User <lala@myBox> on ! Sat, 3 Jan 2004 15:41:49 +0000. ! It was downloaded from <fill in ftp site> - Upstream Author(s): <put author(s) name and email here> - Copyright: - <Must follow here> --- 1,28 ---- ! This package was debianized by Alex de Landgraaf <ale...@xs...> on ! Sat, 3 Jan 2004 14:58:44 +0000. ! It was downloaded from http://www.morphix.org ! ! Upstream Author(s): Alex de Landgraaf <ale...@xs...> and a few contributers ! ! Copyright (C) 2003-2004 Alex de Landgraaf ! ! This program is free software; you can redistribute it and/or modify ! it under the terms of the GNU General Public License as published by ! the Free Software Foundation; either version 2, or (at your option) ! any later version. ! ! This program is distributed in the hope that it will be useful, ! but WITHOUT ANY WARRANTY; without even the implied warranty of ! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! GNU General Public License for more details. ! ! You should have received a copy of the GNU General Public License ! along with this program; if not, write to the Free Software Foundation, ! Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ! ! On Debian GNU/Linux systems, the complete text of the GNU General ! Public License can be found in `/usr/share/common-licenses/GPL'. |
|
From: <ale...@us...> - 2004-01-03 15:50:08
|
Update of /cvsroot/morphix/morphixinstaller/debian In directory sc8-pr-cvs1:/tmp/cvs-serv27264 Modified Files: copyright Log Message: adding copyright info Index: copyright =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/debian/copyright,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** copyright 3 Jan 2004 14:55:29 -0000 1.1 --- copyright 3 Jan 2004 15:49:59 -0000 1.2 *************** *** 1,10 **** ! This package was debianized by Morphix User <lala@myBox> on ! Sat, 3 Jan 2004 15:35:06 +0000. ! It was downloaded from <fill in ftp site> - Upstream Author(s): <put author(s) name and email here> - Copyright: - <Must follow here> --- 1,28 ---- ! This package was debianized by Alex de Landgraaf <ale...@xs...> on ! Sat, 3 Jan 2004 14:58:44 +0000. ! It was downloaded from http://www.morphix.org ! ! Upstream Author(s): Alex de Landgraaf <ale...@xs...> and a few contributers ! ! Copyright (C) 2003-2004 Alex de Landgraaf ! ! This program is free software; you can redistribute it and/or modify ! it under the terms of the GNU General Public License as published by ! the Free Software Foundation; either version 2, or (at your option) ! any later version. ! ! This program is distributed in the hope that it will be useful, ! but WITHOUT ANY WARRANTY; without even the implied warranty of ! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! GNU General Public License for more details. ! ! You should have received a copy of the GNU General Public License ! along with this program; if not, write to the Free Software Foundation, ! Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ! ! On Debian GNU/Linux systems, the complete text of the GNU General ! Public License can be found in `/usr/share/common-licenses/GPL'. |
|
From: <ale...@us...> - 2004-01-03 15:49:46
|
Update of /cvsroot/morphix/networkconf/debian In directory sc8-pr-cvs1:/tmp/cvs-serv27162/debian Modified Files: copyright Log Message: adding copyright info Index: copyright =================================================================== RCS file: /cvsroot/morphix/networkconf/debian/copyright,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** copyright 3 Jan 2004 15:11:09 -0000 1.1 --- copyright 3 Jan 2004 15:49:31 -0000 1.2 *************** *** 1,10 **** ! This package was debianized by Morphix User <lala@myBox> on ! Sat, 3 Jan 2004 15:48:48 +0000. ! It was downloaded from <fill in ftp site> - Upstream Author(s): <put author(s) name and email here> - Copyright: - <Must follow here> --- 1,28 ---- ! This package was debianized by Alex de Landgraaf <ale...@xs...> on ! Sat, 3 Jan 2004 14:58:44 +0000. ! It was downloaded from http://www.morphix.org ! ! Upstream Author(s): Alex de Landgraaf <ale...@xs...> and a few contributers ! ! Copyright (C) 2003-2004 Alex de Landgraaf ! ! This program is free software; you can redistribute it and/or modify ! it under the terms of the GNU General Public License as published by ! the Free Software Foundation; either version 2, or (at your option) ! any later version. ! ! This program is distributed in the hope that it will be useful, ! but WITHOUT ANY WARRANTY; without even the implied warranty of ! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! GNU General Public License for more details. ! ! You should have received a copy of the GNU General Public License ! along with this program; if not, write to the Free Software Foundation, ! Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ! ! On Debian GNU/Linux systems, the complete text of the GNU General ! Public License can be found in `/usr/share/common-licenses/GPL'. |
|
From: <ale...@us...> - 2004-01-03 15:49:32
|
Update of /cvsroot/morphix/partitionmorpher/debian In directory sc8-pr-cvs1:/tmp/cvs-serv27088 Modified Files: copyright Log Message: adding copyright info Index: copyright =================================================================== RCS file: /cvsroot/morphix/partitionmorpher/debian/copyright,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** copyright 3 Jan 2004 14:39:43 -0000 1.1 --- copyright 3 Jan 2004 15:49:05 -0000 1.2 *************** *** 1,10 **** ! This package was debianized by Morphix User <lala@myBox> on Sat, 3 Jan 2004 14:58:44 +0000. ! It was downloaded from <fill in ftp site> - Upstream Author(s): <put author(s) name and email here> - Copyright: - <Must follow here> --- 1,28 ---- ! This package was debianized by Alex de Landgraaf <ale...@xs...> on Sat, 3 Jan 2004 14:58:44 +0000. ! It was downloaded from http://www.morphix.org ! ! Upstream Author(s): Alex de Landgraaf <ale...@xs...> and a few contributers ! ! Copyright (C) 2003-2004 Alex de Landgraaf ! ! This program is free software; you can redistribute it and/or modify ! it under the terms of the GNU General Public License as published by ! the Free Software Foundation; either version 2, or (at your option) ! any later version. ! ! This program is distributed in the hope that it will be useful, ! but WITHOUT ANY WARRANTY; without even the implied warranty of ! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! GNU General Public License for more details. ! ! You should have received a copy of the GNU General Public License ! along with this program; if not, write to the Free Software Foundation, ! Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ! ! On Debian GNU/Linux systems, the complete text of the GNU General ! Public License can be found in `/usr/share/common-licenses/GPL'. |
|
From: <ale...@us...> - 2004-01-03 15:33:35
|
Update of /cvsroot/morphix/datetimeconf/debian
In directory sc8-pr-cvs1:/tmp/cvs-serv24506/debian
Added Files:
README.Debian changelog compat control copyright
datetimeconf.doc-base.EX dirs docs manpage.1.ex
manpage.sgml.ex menu.ex postinst.ex postrm.ex preinst.ex
prerm.ex rules
Log Message:
adding debian/ files
--- NEW FILE: README.Debian ---
datetimeconf for Debian
-----------------------
<possible notes regarding this package - if none, delete this file>
-- Morphix User <lala@myBox>, Sat, 3 Jan 2004 16:12:46 +0000
--- NEW FILE: changelog ---
datetimeconf (0.1-1) unstable; urgency=low
* Initial Release.
-- Alex de Landgraaf <ale...@xs...> Sat, 3 Jan 2004 16:12:46 +0000
--- NEW FILE: compat ---
4
--- NEW FILE: control ---
Source: datetimeconf
Section: admin
Priority: optional
Maintainer: Alex de Landgraaf <ale...@xs...
Build-Depends: debhelper (>= 4.0.0)
Standards-Version: 3.6.0
Package: datetimeconf
Architecture: i386
Depends: ${shlibs:Depends}, libc6 (>= 2.3.2-1), libglib2.0-0, libgtk2.0-0, libpango1.0-0
Description: Date/Time/Timezone configuration tool
This tool uses the Fedora/Redhat UI and is a port of the fedora
tool to Debian-based distributions, letting users easily change
their date, time and timezone settings, optionally using a NTP
server of their choice. Uses a GTK frontend.
.
This tool is still under development and should be considered
experimental. This tool was developed for the Morphix project.
--- NEW FILE: copyright ---
This package was debianized by Morphix User <lala@myBox> on
Sat, 3 Jan 2004 16:12:46 +0000.
It was downloaded from <fill in ftp site>
Upstream Author(s): <put author(s) name and email here>
Copyright:
<Must follow here>
--- NEW FILE: datetimeconf.doc-base.EX ---
Document: datetimeconf
Title: Debian datetimeconf Manual
Author: <insert document author here>
Abstract: This manual describes what datetimeconf is
and how it can be used to
manage online manuals on Debian systems.
Section: unknown
Format: debiandoc-sgml
Files: /usr/share/doc/datetimeconf/datetimeconf.sgml.gz
Format: postscript
Files: /usr/share/doc/datetimeconf/datetimeconf.ps.gz
Format: text
Files: /usr/share/doc/datetimeconf/datetimeconf.text.gz
Format: HTML
Index: /usr/share/doc/datetimeconf/html/index.html
Files: /usr/share/doc/datetimeconf/html/*.html
--- NEW FILE: dirs ---
usr/bin
usr/sbin
--- NEW FILE: docs ---
NEWS
README
--- NEW FILE: manpage.1.ex ---
.\" Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH DATETIMECONF SECTION "January 3, 2004"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
datetimeconf \- program to do something
.SH SYNOPSIS
.B datetimeconf
.RI [ options ] " files" ...
.br
.B bar
.RI [ options ] " files" ...
.SH DESCRIPTION
This manual page documents briefly the
.B datetimeconf
and
.B bar
commands.
This manual page was written for the Debian distribution
because the original program does not have a manual page.
Instead, it has documentation in the GNU Info format; see below.
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" respectively.
\fBdatetimeconf\fP is a program that...
.SH OPTIONS
These programs follow the usual GNU command line syntax, with long
options starting with two dashes (`-').
A summary of options is included below.
For a complete description, see the Info files.
.TP
.B \-h, \-\-help
Show summary of options.
.TP
.B \-v, \-\-version
Show version of program.
.SH SEE ALSO
.BR bar (1),
.BR baz (1).
.br
The programs are documented fully by
.IR "The Rise and Fall of a Fooish Bar" ,
available via the Info system.
.SH AUTHOR
This manual page was written by Morphix User <lala@myBox>,
for the Debian project (but may be used by others).
--- NEW FILE: manpage.sgml.ex ---
<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
<!-- Process this file with docbook-to-man to generate an nroff manual
page: `docbook-to-man manpage.sgml > manpage.1'. You may view
the manual page with: `docbook-to-man manpage.sgml | nroff -man |
less'. A typical entry in a Makefile or Makefile.am is:
manpage.1: manpage.sgml
docbook-to-man $< > $@
The docbook-to-man binary is found in the docbook-to-man package.
Please remember that if you create the nroff version in one of the
debian/rules file targets (such as build), you will need to include
docbook-to-man in your Build-Depends control field.
-->
<!-- Fill in your name for FIRSTNAME and SURNAME. -->
<!ENTITY dhfirstname "<firstname>FIRSTNAME</firstname>">
<!ENTITY dhsurname "<surname>SURNAME</surname>">
<!-- Please adjust the date whenever revising the manpage. -->
<!ENTITY dhdate "<date>January 3, 2004</date>">
<!-- SECTION should be 1-8, maybe w/ subsection other parameters are
allowed: see man(7), man(1). -->
<!ENTITY dhsection "<manvolnum>SECTION</manvolnum>">
<!ENTITY dhemail "<email>lala@myBox</email>">
<!ENTITY dhusername "Morphix User">
<!ENTITY dhucpackage "<refentrytitle>DATETIMECONF</refentrytitle>">
<!ENTITY dhpackage "datetimeconf">
<!ENTITY debian "<productname>Debian</productname>">
<!ENTITY gnu "<acronym>GNU</acronym>">
<!ENTITY gpl "&gnu; <acronym>GPL</acronym>">
]>
<refentry>
<refentryinfo>
<address>
&dhemail;
</address>
<author>
&dhfirstname;
&dhsurname;
</author>
<copyright>
<year>2003</year>
<holder>&dhusername;</holder>
</copyright>
&dhdate;
</refentryinfo>
<refmeta>
&dhucpackage;
&dhsection;
</refmeta>
<refnamediv>
<refname>&dhpackage;</refname>
<refpurpose>program to do something</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
<command>&dhpackage;</command>
<arg><option>-e <replaceable>this</replaceable></option></arg>
<arg><option>--example <replaceable>that</replaceable></option></arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
<para>This manual page documents briefly the
<command>&dhpackage;</command> and <command>bar</command>
commands.</para>
<para>This manual page was written for the &debian; distribution
because the original program does not have a manual page.
Instead, it has documentation in the &gnu;
<application>Info</application> format; see below.</para>
<para><command>&dhpackage;</command> is a program that...</para>
</refsect1>
<refsect1>
<title>OPTIONS</title>
<para>These programs follow the usual &gnu; command line syntax,
with long options starting with two dashes (`-'). A summary of
options is included below. For a complete description, see the
<application>Info</application> files.</para>
<variablelist>
<varlistentry>
<term><option>-h</option>
<option>--help</option>
</term>
<listitem>
<para>Show summary of options.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>-v</option>
<option>--version</option>
</term>
<listitem>
<para>Show version of program.</para>
</listitem>
</varlistentry>
</variablelist>
</refsect1>
<refsect1>
<title>SEE ALSO</title>
<para>bar (1), baz (1).</para>
<para>The programs are documented fully by <citetitle>The Rise and
Fall of a Fooish Bar</citetitle> available via the
<application>Info</application> system.</para>
</refsect1>
<refsect1>
<title>AUTHOR</title>
<para>This manual page was written by &dhusername; &dhemail; for
the &debian; system (but may be used by others). Permission is
granted to copy, distribute and/or modify this document under
the terms of the &gnu; General Public License, Version 2 any
later version published by the Free Software Foundation.
</para>
<para>
On Debian systems, the complete text of the GNU General Public
License can be found in /usr/share/common-licenses/GPL.
</para>
</refsect1>
</refentry>
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
sgml-omittag:t
sgml-shorttag:t
sgml-minimize-attributes:nil
sgml-always-quote-attributes:t
sgml-indent-step:2
sgml-indent-data:t
sgml-parent-document:nil
sgml-default-dtd-file:nil
sgml-exposed-tags:nil
sgml-local-catalogs:nil
sgml-local-ecat-files:nil
End:
-->
--- NEW FILE: menu.ex ---
?package(datetimeconf):needs=X11|text|vc|wm section=Apps/see-menu-manual\
title="datetimeconf" command="/usr/bin/datetimeconf"
--- NEW FILE: postinst.ex ---
#! /bin/sh
# postinst script for datetimeconf
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <postinst> `configure' <most-recently-configured-version>
# * <old-postinst> `abort-upgrade' <new version>
# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
# <new-version>
# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
# <failed-install-package> <version> `removing'
# <conflicting-package> <version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
#
# quoting from the policy:
# Any necessary prompting should almost always be confined to the
# post-installation script, and should be protected with a conditional
# so that unnecessary prompting doesn't happen if a package's
# installation fails and the `postinst' is called with `abort-upgrade',
# `abort-remove' or `abort-deconfigure'.
case "$1" in
configure)
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
*)
echo "postinst called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0
--- NEW FILE: postrm.ex ---
#! /bin/sh
# postrm script for datetimeconf
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <postrm> `remove'
# * <postrm> `purge'
# * <old-postrm> `upgrade' <new-version>
# * <new-postrm> `failed-upgrade' <old-version>
# * <new-postrm> `abort-install'
# * <new-postrm> `abort-install' <old-version>
# * <new-postrm> `abort-upgrade' <old-version>
# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
;;
*)
echo "postrm called with unknown argument \`$1'" >&2
exit 1
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0
--- NEW FILE: preinst.ex ---
#! /bin/sh
# preinst script for datetimeconf
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <new-preinst> `install'
# * <new-preinst> `install' <old-version>
# * <new-preinst> `upgrade' <old-version>
# * <old-preinst> `abort-upgrade' <new-version>
#
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
install|upgrade)
# if [ "$1" = "upgrade" ]
# then
# start-stop-daemon --stop --quiet --oknodo \
# --pidfile /var/run/datetimeconf.pid \
# --exec /usr/sbin/datetimeconf 2>/dev/null || true
# fi
;;
abort-upgrade)
;;
*)
echo "preinst called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0
--- NEW FILE: prerm.ex ---
#! /bin/sh
# prerm script for datetimeconf
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <prerm> `remove'
# * <old-prerm> `upgrade' <new-version>
# * <new-prerm> `failed-upgrade' <old-version>
# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
# * <deconfigured's-prerm> `deconfigure' `in-favour'
# <package-being-installed> <version> `removing'
# <conflicting-package> <version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
remove|upgrade|deconfigure)
# install-info --quiet --remove /usr/info/datetimeconf.info.gz
;;
failed-upgrade)
;;
*)
echo "prerm called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0
--- NEW FILE: rules ---
#!/usr/bin/make -f
# -*- makefile -*-
# Sample debian/rules that uses debhelper.
# GNU copyright 1997 to 1999 by Joey Hess.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
endif
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
config.status: configure
dh_testdir
# Add here commands to configure the package.
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
build: build-stamp
build-stamp: config.status
dh_testdir
# Add here commands to compile the package.
$(MAKE)
#/usr/bin/docbook-to-man debian/datetimeconf.sgml > datetimeconf.1
touch build-stamp
clean:
dh_testdir
dh_testroot
rm -f build-stamp
# Add here commands to clean up after the build process.
-$(MAKE) distclean
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
endif
dh_clean
install: build
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
# Add here commands to install the package into debian/datetimeconf.
$(MAKE) install DESTDIR=$(CURDIR)/debian/datetimeconf
# Build architecture-independent files here.
binary-indep: build install
# We have nothing to do by default.
# Build architecture-dependent files here.
binary-arch: build install
dh_testdir
dh_testroot
dh_installchangelogs ChangeLog
dh_installdocs
dh_installexamples
# dh_install
# dh_installmenu
# dh_installdebconf
# dh_installlogrotate
# dh_installemacsen
# dh_installpam
# dh_installmime
# dh_installinit
# dh_installcron
# dh_installinfo
dh_installman
dh_link
dh_strip
dh_compress
dh_fixperms
# dh_perl
# dh_python
# dh_makeshlibs
dh_installdeb
dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
|
|
From: <ale...@us...> - 2004-01-03 15:32:54
|
Update of /cvsroot/morphix/datetimeconf/debian In directory sc8-pr-cvs1:/tmp/cvs-serv24396/debian Log Message: Directory /cvsroot/morphix/datetimeconf/debian added to the repository |
|
From: <ale...@us...> - 2004-01-03 15:26:19
|
Update of /cvsroot/morphix/keybconf/debian
In directory sc8-pr-cvs1:/tmp/cvs-serv23486/debian
Added Files:
README.Debian changelog compat control copyright dirs docs
keybconf.doc-base.EX manpage.1.ex manpage.sgml.ex menu.ex
postinst.ex postrm.ex preinst.ex prerm.ex rules
Log Message:
adding debian/ files (sigh)
--- NEW FILE: README.Debian ---
keybconf for Debian
-------------------
<possible notes regarding this package - if none, delete this file>
-- Morphix User <lala@myBox>, Sat, 3 Jan 2004 16:03:28 +0000
--- NEW FILE: changelog ---
keybconf (0.1-1) unstable; urgency=low
* Initial Release.
-- Alex de Landgraaf <ale...@xs...> Sat, 3 Jan 2004 16:03:28 +0000
--- NEW FILE: compat ---
4
--- NEW FILE: control ---
Source: keybconf
Section: admin
Priority: optional
Maintainer: Alex de Landgraaf <ale...@xs...>
Build-Depends: debhelper (>= 4.0.0)
Standards-Version: 3.6.0
Package: keybconf
Architecture: i386
Depends: ${shlibs:Depends}, libc6 (>= 2.3.2-1), libglib2.0-0, libgtk2.0-0, libpango1.0-0
Description: Keyboard configuration tool
Keyboard configuration tool for Debian-based distributions,
this tool uses the Fedora/Redhat UI to easily let users change
their keyboard configuration/i18n settings using a GTK frontend
.
This tool should still be considered experimental and lacks
integration with debconf. This tool was developed for the Morphix project
--- NEW FILE: copyright ---
This package was debianized by Morphix User <lala@myBox> on
Sat, 3 Jan 2004 16:03:28 +0000.
It was downloaded from <fill in ftp site>
Upstream Author(s): <put author(s) name and email here>
Copyright:
<Must follow here>
--- NEW FILE: dirs ---
usr/bin
usr/sbin
--- NEW FILE: docs ---
NEWS
README
--- NEW FILE: keybconf.doc-base.EX ---
Document: keybconf
Title: Debian keybconf Manual
Author: <insert document author here>
Abstract: This manual describes what keybconf is
and how it can be used to
manage online manuals on Debian systems.
Section: unknown
Format: debiandoc-sgml
Files: /usr/share/doc/keybconf/keybconf.sgml.gz
Format: postscript
Files: /usr/share/doc/keybconf/keybconf.ps.gz
Format: text
Files: /usr/share/doc/keybconf/keybconf.text.gz
Format: HTML
Index: /usr/share/doc/keybconf/html/index.html
Files: /usr/share/doc/keybconf/html/*.html
--- NEW FILE: manpage.1.ex ---
.\" Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH KEYBCONF SECTION "January 3, 2004"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
keybconf \- program to do something
.SH SYNOPSIS
.B keybconf
.RI [ options ] " files" ...
.br
.B bar
.RI [ options ] " files" ...
.SH DESCRIPTION
This manual page documents briefly the
.B keybconf
and
.B bar
commands.
This manual page was written for the Debian distribution
because the original program does not have a manual page.
Instead, it has documentation in the GNU Info format; see below.
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" respectively.
\fBkeybconf\fP is a program that...
.SH OPTIONS
These programs follow the usual GNU command line syntax, with long
options starting with two dashes (`-').
A summary of options is included below.
For a complete description, see the Info files.
.TP
.B \-h, \-\-help
Show summary of options.
.TP
.B \-v, \-\-version
Show version of program.
.SH SEE ALSO
.BR bar (1),
.BR baz (1).
.br
The programs are documented fully by
.IR "The Rise and Fall of a Fooish Bar" ,
available via the Info system.
.SH AUTHOR
This manual page was written by Morphix User <lala@myBox>,
for the Debian project (but may be used by others).
--- NEW FILE: manpage.sgml.ex ---
<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
<!-- Process this file with docbook-to-man to generate an nroff manual
page: `docbook-to-man manpage.sgml > manpage.1'. You may view
the manual page with: `docbook-to-man manpage.sgml | nroff -man |
less'. A typical entry in a Makefile or Makefile.am is:
manpage.1: manpage.sgml
docbook-to-man $< > $@
The docbook-to-man binary is found in the docbook-to-man package.
Please remember that if you create the nroff version in one of the
debian/rules file targets (such as build), you will need to include
docbook-to-man in your Build-Depends control field.
-->
<!-- Fill in your name for FIRSTNAME and SURNAME. -->
<!ENTITY dhfirstname "<firstname>FIRSTNAME</firstname>">
<!ENTITY dhsurname "<surname>SURNAME</surname>">
<!-- Please adjust the date whenever revising the manpage. -->
<!ENTITY dhdate "<date>January 3, 2004</date>">
<!-- SECTION should be 1-8, maybe w/ subsection other parameters are
allowed: see man(7), man(1). -->
<!ENTITY dhsection "<manvolnum>SECTION</manvolnum>">
<!ENTITY dhemail "<email>lala@myBox</email>">
<!ENTITY dhusername "Morphix User">
<!ENTITY dhucpackage "<refentrytitle>KEYBCONF</refentrytitle>">
<!ENTITY dhpackage "keybconf">
<!ENTITY debian "<productname>Debian</productname>">
<!ENTITY gnu "<acronym>GNU</acronym>">
<!ENTITY gpl "&gnu; <acronym>GPL</acronym>">
]>
<refentry>
<refentryinfo>
<address>
&dhemail;
</address>
<author>
&dhfirstname;
&dhsurname;
</author>
<copyright>
<year>2003</year>
<holder>&dhusername;</holder>
</copyright>
&dhdate;
</refentryinfo>
<refmeta>
&dhucpackage;
&dhsection;
</refmeta>
<refnamediv>
<refname>&dhpackage;</refname>
<refpurpose>program to do something</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
<command>&dhpackage;</command>
<arg><option>-e <replaceable>this</replaceable></option></arg>
<arg><option>--example <replaceable>that</replaceable></option></arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
<para>This manual page documents briefly the
<command>&dhpackage;</command> and <command>bar</command>
commands.</para>
<para>This manual page was written for the &debian; distribution
because the original program does not have a manual page.
Instead, it has documentation in the &gnu;
<application>Info</application> format; see below.</para>
<para><command>&dhpackage;</command> is a program that...</para>
</refsect1>
<refsect1>
<title>OPTIONS</title>
<para>These programs follow the usual &gnu; command line syntax,
with long options starting with two dashes (`-'). A summary of
options is included below. For a complete description, see the
<application>Info</application> files.</para>
<variablelist>
<varlistentry>
<term><option>-h</option>
<option>--help</option>
</term>
<listitem>
<para>Show summary of options.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>-v</option>
<option>--version</option>
</term>
<listitem>
<para>Show version of program.</para>
</listitem>
</varlistentry>
</variablelist>
</refsect1>
<refsect1>
<title>SEE ALSO</title>
<para>bar (1), baz (1).</para>
<para>The programs are documented fully by <citetitle>The Rise and
Fall of a Fooish Bar</citetitle> available via the
<application>Info</application> system.</para>
</refsect1>
<refsect1>
<title>AUTHOR</title>
<para>This manual page was written by &dhusername; &dhemail; for
the &debian; system (but may be used by others). Permission is
granted to copy, distribute and/or modify this document under
the terms of the &gnu; General Public License, Version 2 any
later version published by the Free Software Foundation.
</para>
<para>
On Debian systems, the complete text of the GNU General Public
License can be found in /usr/share/common-licenses/GPL.
</para>
</refsect1>
</refentry>
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
sgml-omittag:t
sgml-shorttag:t
sgml-minimize-attributes:nil
sgml-always-quote-attributes:t
sgml-indent-step:2
sgml-indent-data:t
sgml-parent-document:nil
sgml-default-dtd-file:nil
sgml-exposed-tags:nil
sgml-local-catalogs:nil
sgml-local-ecat-files:nil
End:
-->
--- NEW FILE: menu.ex ---
?package(keybconf):needs=X11|text|vc|wm section=Apps/see-menu-manual\
title="keybconf" command="/usr/bin/keybconf"
--- NEW FILE: postinst.ex ---
#! /bin/sh
# postinst script for keybconf
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <postinst> `configure' <most-recently-configured-version>
# * <old-postinst> `abort-upgrade' <new version>
# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
# <new-version>
# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
# <failed-install-package> <version> `removing'
# <conflicting-package> <version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
#
# quoting from the policy:
# Any necessary prompting should almost always be confined to the
# post-installation script, and should be protected with a conditional
# so that unnecessary prompting doesn't happen if a package's
# installation fails and the `postinst' is called with `abort-upgrade',
# `abort-remove' or `abort-deconfigure'.
case "$1" in
configure)
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
*)
echo "postinst called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0
--- NEW FILE: postrm.ex ---
#! /bin/sh
# postrm script for keybconf
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <postrm> `remove'
# * <postrm> `purge'
# * <old-postrm> `upgrade' <new-version>
# * <new-postrm> `failed-upgrade' <old-version>
# * <new-postrm> `abort-install'
# * <new-postrm> `abort-install' <old-version>
# * <new-postrm> `abort-upgrade' <old-version>
# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
;;
*)
echo "postrm called with unknown argument \`$1'" >&2
exit 1
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0
--- NEW FILE: preinst.ex ---
#! /bin/sh
# preinst script for keybconf
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <new-preinst> `install'
# * <new-preinst> `install' <old-version>
# * <new-preinst> `upgrade' <old-version>
# * <old-preinst> `abort-upgrade' <new-version>
#
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
install|upgrade)
# if [ "$1" = "upgrade" ]
# then
# start-stop-daemon --stop --quiet --oknodo \
# --pidfile /var/run/keybconf.pid \
# --exec /usr/sbin/keybconf 2>/dev/null || true
# fi
;;
abort-upgrade)
;;
*)
echo "preinst called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0
--- NEW FILE: prerm.ex ---
#! /bin/sh
# prerm script for keybconf
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <prerm> `remove'
# * <old-prerm> `upgrade' <new-version>
# * <new-prerm> `failed-upgrade' <old-version>
# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
# * <deconfigured's-prerm> `deconfigure' `in-favour'
# <package-being-installed> <version> `removing'
# <conflicting-package> <version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
remove|upgrade|deconfigure)
# install-info --quiet --remove /usr/info/keybconf.info.gz
;;
failed-upgrade)
;;
*)
echo "prerm called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0
--- NEW FILE: rules ---
#!/usr/bin/make -f
# -*- makefile -*-
# Sample debian/rules that uses debhelper.
# GNU copyright 1997 to 1999 by Joey Hess.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
endif
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
configure: configure-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
touch configure-stamp
build: build-stamp
build-stamp: configure-stamp
dh_testdir
# Add here commands to compile the package.
$(MAKE)
#/usr/bin/docbook-to-man debian/keybconf.sgml > keybconf.1
touch build-stamp
clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
# Add here commands to clean up after the build process.
-$(MAKE) clean
dh_clean
install: build
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
# Add here commands to install the package into debian/keybconf.
$(MAKE) install DESTDIR=$(CURDIR)/debian/keybconf
# Build architecture-independent files here.
binary-indep: build install
# We have nothing to do by default.
# Build architecture-dependent files here.
binary-arch: build install
dh_testdir
dh_testroot
dh_installchangelogs ChangeLog
dh_installdocs
dh_installexamples
# dh_install
# dh_installmenu
# dh_installdebconf
# dh_installlogrotate
# dh_installemacsen
# dh_installpam
# dh_installmime
# dh_installinit
# dh_installcron
# dh_installinfo
dh_installman
dh_link
dh_strip
dh_compress
dh_fixperms
# dh_perl
# dh_python
# dh_makeshlibs
dh_installdeb
dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install configure
|
|
From: <ale...@us...> - 2004-01-03 15:24:49
|
Update of /cvsroot/morphix/keybconf/debian In directory sc8-pr-cvs1:/tmp/cvs-serv23249/debian Log Message: Directory /cvsroot/morphix/keybconf/debian added to the repository |
1 message has been excluded from this view by a project administrator.
