Skip to content

Commit

Permalink
Replace runlevel whit systemd services-manager
Browse files Browse the repository at this point in the history
  • Loading branch information
Vladimir Moravec committed Nov 7, 2013
1 parent 850ecb7 commit 50c21e7
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 31 deletions.
9 changes: 4 additions & 5 deletions control/control.SLED.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ textdomain="control"
<clone_module>host</clone_module>
<clone_module>routing</clone_module>
<clone_module>proxy</clone_module>
<clone_module>runlevel</clone_module>
<clone_module>services-manager</clone_module>
<clone_module>x11</clone_module>
<clone_module>nis</clone_module>
<clone_module>ldap</clone_module>
Expand Down Expand Up @@ -421,9 +421,8 @@ Please visit us at http://www.suse.com/.
<name>software</name>
<presentation_order>35</presentation_order>
</proposal_module>
<!-- propose the default runlevel after software is selected, bnc #380141 -->
<proposal_module>
<name>runlevel</name>
<name>services-manager</name>
<presentation_order>55</presentation_order>
</proposal_module>
</proposal_modules>
Expand All @@ -449,7 +448,7 @@ Please visit us at http://www.suse.com/.
<proposal_module>software</proposal_module>
<proposal_module>timezone</proposal_module>
<proposal_module>language</proposal_module>
<proposal_module>runlevel</proposal_module>
<proposal_module>services-manager</proposal_module>
</proposal_modules>
</proposal_tab>
</proposal_tabs>
Expand All @@ -468,7 +467,7 @@ Please visit us at http://www.suse.com/.
<proposal_module>country_simple</proposal_module>
<proposal_module>timezone</proposal_module>
<proposal_module>users</proposal_module>
<proposal_module>runlevel</proposal_module>
<proposal_module>services-manager</proposal_module>
</proposal_modules>
</proposal>
<proposal>
Expand Down
14 changes: 6 additions & 8 deletions control/control.SLES-for-VMware.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ textdomain="control"
<clone_module>host</clone_module>
<clone_module>routing</clone_module>
<clone_module>proxy</clone_module>
<clone_module>runlevel</clone_module>
<clone_module>services-manager</clone_module>
<clone_module>x11</clone_module>
<clone_module>nis</clone_module>
<clone_module>ldap</clone_module>
Expand Down Expand Up @@ -369,9 +369,8 @@ Choose the one that matches your server the best.</label></scenarios_text>
<name>software</name>
<presentation_order>35</presentation_order>
</proposal_module>
<!-- propose the default runlevel after software is selected, bnc #380141 -->
<proposal_module>
<name>runlevel</name>
<name>services-manager</name>
<presentation_order>55</presentation_order>
</proposal_module>
</proposal_modules>
Expand Down Expand Up @@ -399,7 +398,7 @@ Choose the one that matches your server the best.</label></scenarios_text>
<proposal_module>software</proposal_module>
<proposal_module>timezone</proposal_module>
<proposal_module>language</proposal_module>
<proposal_module>runlevel</proposal_module>
<proposal_module>services-manager</proposal_module>
<proposal_module>kdump</proposal_module>
</proposal_modules>
</proposal_tab>
Expand Down Expand Up @@ -457,9 +456,8 @@ Choose the one that matches your server the best.</label></scenarios_text>
<name>software</name>
<presentation_order>30</presentation_order>
</proposal_module>
<!-- propose the default runlevel after software is selected, bnc #380141 -->
<proposal_module>
<name>runlevel</name>
<name>services-manager</name>
<presentation_order>50</presentation_order>
</proposal_module>
</proposal_modules>
Expand All @@ -484,7 +482,7 @@ Choose the one that matches your server the best.</label></scenarios_text>
<proposal_module>software</proposal_module>
<proposal_module>timezone</proposal_module>
<proposal_module>language</proposal_module>
<proposal_module>runlevel</proposal_module>
<proposal_module>services-manager</proposal_module>
<proposal_module>dasd</proposal_module>
<proposal_module>zfcp</proposal_module>
</proposal_modules>
Expand All @@ -506,7 +504,7 @@ Choose the one that matches your server the best.</label></scenarios_text>
<proposal_module>country_simple</proposal_module>
<proposal_module>timezone</proposal_module>
<proposal_module>users</proposal_module>
<proposal_module>runlevel</proposal_module>
<proposal_module>services-manager</proposal_module>
</proposal_modules>
</proposal>

Expand Down
13 changes: 6 additions & 7 deletions control/control.SLES.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ textdomain="control"
<clone_module>host</clone_module>
<clone_module>routing</clone_module>
<clone_module>proxy</clone_module>
<clone_module>runlevel</clone_module>
<clone_module>services-manager</clone_module>
<clone_module>x11</clone_module>
<clone_module>nis</clone_module>
<clone_module>ldap</clone_module>
Expand Down Expand Up @@ -395,7 +395,7 @@ Choose the one that matches your server the best.</label></scenarios_text>
</proposal_module>
<!-- propose the default runlevel after software is selected, bnc #380141 -->
<proposal_module>
<name>runlevel</name>
<name>services-manager</name>
<presentation_order>55</presentation_order>
</proposal_module>
</proposal_modules>
Expand Down Expand Up @@ -423,7 +423,7 @@ Choose the one that matches your server the best.</label></scenarios_text>
<proposal_module>software</proposal_module>
<proposal_module>timezone</proposal_module>
<proposal_module>language</proposal_module>
<proposal_module>runlevel</proposal_module>
<proposal_module>services-manager</proposal_module>
<proposal_module>kdump</proposal_module>
</proposal_modules>
</proposal_tab>
Expand Down Expand Up @@ -481,9 +481,8 @@ Choose the one that matches your server the best.</label></scenarios_text>
<name>software</name>
<presentation_order>30</presentation_order>
</proposal_module>
<!-- propose the default runlevel after software is selected, bnc #380141 -->
<proposal_module>
<name>runlevel</name>
<name>services-manager</name>
<presentation_order>50</presentation_order>
</proposal_module>
</proposal_modules>
Expand All @@ -508,7 +507,7 @@ Choose the one that matches your server the best.</label></scenarios_text>
<proposal_module>software</proposal_module>
<proposal_module>timezone</proposal_module>
<proposal_module>language</proposal_module>
<proposal_module>runlevel</proposal_module>
<proposal_module>services-manager</proposal_module>
<proposal_module>dasd</proposal_module>
<proposal_module>zfcp</proposal_module>
</proposal_modules>
Expand All @@ -530,7 +529,7 @@ Choose the one that matches your server the best.</label></scenarios_text>
<proposal_module>country_simple</proposal_module>
<proposal_module>timezone</proposal_module>
<proposal_module>users</proposal_module>
<proposal_module>runlevel</proposal_module>
<proposal_module>services-manager</proposal_module>
</proposal_modules>
</proposal>

Expand Down
9 changes: 4 additions & 5 deletions control/control.openSUSE.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ textdomain="control"
<clone_module>host</clone_module>
<clone_module>routing</clone_module>
<clone_module>proxy</clone_module>
<clone_module>runlevel</clone_module>
<clone_module>services-manager</clone_module>
<!-- <clone_module>x11</clone_module> (bnc#441404) -->
<clone_module>nis</clone_module>
<clone_module>ldap</clone_module>
Expand Down Expand Up @@ -497,9 +497,8 @@ is the most appropriate desktop for you.</label></desktop_dialog>
<name>software</name>
<presentation_order>30</presentation_order>
</proposal_module>
<!-- propose the default runlevel after software is selected, bnc #380141 -->
<proposal_module>
<name>runlevel</name>
<name>services-manager</name>
<presentation_order>70</presentation_order>
</proposal_module>
<!-- finds images to deploy -->
Expand Down Expand Up @@ -534,7 +533,7 @@ is the most appropriate desktop for you.</label></desktop_dialog>
<proposal_module>timezone</proposal_module>
<proposal_module>language</proposal_module>
<proposal_module>users</proposal_module>
<proposal_module>runlevel</proposal_module>
<proposal_module>services-manager</proposal_module>
</proposal_modules>
</proposal_tab>
</proposal_tabs>
Expand All @@ -555,7 +554,7 @@ is the most appropriate desktop for you.</label></desktop_dialog>
<proposal_module>country_simple</proposal_module>
<proposal_module>timezone</proposal_module>
<proposal_module>users</proposal_module>
<proposal_module>runlevel</proposal_module>
<proposal_module>services-manager</proposal_module>
</proposal_modules>
</proposal>

Expand Down
6 changes: 3 additions & 3 deletions control/examples/custom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ textdomain="control"
<enable_autologin config:type="boolean">true</enable_autologin>
<language>de_DE</language>
<timezone>Canada/Eastern</timezone>
<runlevel>5</runlevel>
<default_target>graphical</default_target>
</globals>

<!-- Force a selection (`fixed) to be used instead of automatically
Expand Down Expand Up @@ -74,7 +74,7 @@ textdomain="control"
<proposal_module>bootloader</proposal_module>
<proposal_module>timezone</proposal_module>
<proposal_module>language</proposal_module>
<proposal_module>runlevel</proposal_module>
<proposal_module>services-manager</proposal_module>
</proposal_modules>
</proposal>
<proposal>
Expand Down Expand Up @@ -142,7 +142,7 @@ textdomain="control"
<proposal_module>software</proposal_module>
<proposal_module>timezone</proposal_module>
<proposal_module>language</proposal_module>
<proposal_module>runlevel</proposal_module>
<proposal_module>services-manager</proposal_module>
</proposal_modules>
</proposal>
<proposal>
Expand Down
2 changes: 1 addition & 1 deletion control/tests/test.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ textdomain="control"
<proposal_module>bootloader</proposal_module>
<proposal_module>timezone</proposal_module>
<proposal_module>language</proposal_module>
<proposal_module>runlevel</proposal_module>
<proposal_module>services-manager</proposal_module>
</proposal_modules>
</proposal>
<proposal>
Expand Down
4 changes: 2 additions & 2 deletions src/clients/inst_finish.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def main
"save_config",
# For live installer only
Mode.live_installation ? "live_save_config" : "",
"runlevel",
"services-manager",
"desktop",
"storage",
"iscsi-client",
Expand Down Expand Up @@ -425,7 +425,7 @@ def main
if Popup.ConfirmAbort(:incomplete)
@aborted = true
raise Break
end
end
# Anything else
else
SlideShow.HandleInput(user_ret)
Expand Down

0 comments on commit 50c21e7

Please sign in to comment.