@@ -, +, @@ --- .../univention-bootsplash/conffiles/bootsplash.py | 11 +++-- .../base/univention-bootsplash/debian/changelog | 12 +++++- .../debian/univention-bootsplash.dirs | 2 - .../debian/univention-bootsplash.postinst | 29 ++----------- .../base/univention-bootsplash/ucs/logo.png | Bin 19449 -> 0 bytes .../base/univention-bootsplash/ucs/ucs.plymouth | 7 +--- .../base/univention-bootsplash/ucs/ucs.script | 45 ++++++++++----------- 7 files changed, 44 insertions(+), 62 deletions(-) delete mode 100644 branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/debian/univention-bootsplash.dirs delete mode 100644 branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/ucs/logo.png --- a/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/conffiles/bootsplash.py +++ a/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/conffiles/bootsplash.py @@ -1,9 +1,12 @@ -import os +from subprocess import call + def postinst(baseConfig, changes): theme = changes.get("bootsplash/theme", False) - if theme and type(()) == type(theme): + try: old, new = theme + except (TypeError, ValueError): + pass + else: if new: - os.system("plymouth-set-default-theme %s" % new) - os.system("update-initramfs -u") + call(("plymouth-set-default-theme", "--rebuild-initrd", new)) --- a/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/debian/changelog +++ a/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/debian/changelog @@ -1,3 +1,13 @@ +univention-bootsplash (6.0.1-2) unstable; urgency=low + + * Bug #35935: + - remove old logo + - fix screen location of text + * Fix shell quoting error + * debian/*: remove no longer required files and code + + -- Philipp Hahn Mon, 22 Sep 2014 11:34:18 +0200 + univention-bootsplash (6.0.1-1) unstable; urgency=low * new bootsplash layout (Bug #35935) @@ -313,5 +323,3 @@ univention-bootsplash (0.1) unstable; urgency=low * initial release -- Felix Meier Fri, 3 Dec 2004 17:02:27 +0100 - - --- a/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/debian/univention-bootsplash.dirs +++ a/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/debian/univention-bootsplash.dirs @@ -1,2 +0,0 @@ -usr/share/plymouth/themes/ucs -etc --- a/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/debian/univention-bootsplash.postinst +++ a/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/debian/univention-bootsplash.postinst @@ -32,38 +32,15 @@ eval "$(univention-config-registry shell)" -# update to ucs 3.0 with plymouth, can be removed after 3.0-0 -if [ "$1" = configure -a -n "$2" ] && dpkg --compare-versions "$2" lt 4.0.0-1; then - univention-config-registry set bootsplash/theme="ucs" - - splash=false - if echo $grub_append | grep -iq '\'; then - splash=true - fi - if echo $grub_append | grep -iq '\'; then - splash=true - fi - if echo $grub_append | grep -iq '\'; then - splash=false - fi - # remove splash stuff from grub/append - new=$(echo $grub_append | sed 's|\||g;s|\||g;s|\||g') - univention-config-registry set grub/append="$new" - if [ "true" = "$splash" ]; then - univention-config-registry set grub/bootsplash=splash - else - univention-config-registry set grub/bootsplash=nosplash - fi -fi - - univention-config-registry set \ bootsplash/theme?"ucs" \ grub/bootsplash?splash #DEBHELPER# -update-initramfs -u +if [ -x /usr/sbin/update-initramfs ]; then + update-initramfs -u +fi if [ -x /usr/bin/update-grub ]; then update-grub --- a/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/ucs/ucs.plymouth +++ a/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/ucs/ucs.plymouth @@ -1,11 +1,8 @@ [Plymouth Theme] -Name=Script -Description=Script example plugin. +Name=UCS-4 +Description=Univention Corporate Server 4 ModuleName=script [script] ImageDir=/usr/share/plymouth/themes/ucs ScriptFile=/usr/share/plymouth/themes/ucs/ucs.script - -[script-env-vars] -example_env_var=example env var value --- a/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/ucs/ucs.script +++ a/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/ucs/ucs.script @@ -1,4 +1,4 @@ -# This is an example plymouth plugin script +# This is the Univention Corporate Server 4 plymouth plugin script # background image bg.image = Image("bg.png"); @@ -29,8 +29,8 @@ status = "normal"; line_height = Image.Text("AfpqtM").GetHeight(); -# to determine the mode of operation plymouth was started in use Plymouth.GetMode -# which returns a string of one of: "boot", "shutdown", "suspend", "resume" or unknown. +# to determine the mode of operation plymouth was started in use Plymouth.GetMode +# which returns a string of one of: "boot", "shutdown", "suspend", "resume" or unknown. #status = Plymouth.GetMode (); ########## @@ -156,7 +156,7 @@ fun ask_dialog() { for (i=0; i < ASK_PROMPT_LINES; i++) { prompt[i].sprite = Sprite(); - prompt[i].sprite.SetPosition(10, 50 + (20 * i), 10000); + prompt[i].sprite.SetPosition(10, 80 + (20 * i), 10000); } prompt.setText = fun (string) { @@ -192,7 +192,7 @@ fun ask_dialog() { prompt.y + 20, 10000 ); - }; + }; global.ask.prompt = prompt; global.ask.text = text; @@ -206,16 +206,16 @@ fun dialog_setup() { local.lock; local.entry; local.prompt; - + lock.image = Image("lock.png"); entry.image = Image("entry.png"); - + lock.sprite = Sprite(lock.image); lock.x = Window.GetX() + Window.GetWidth() / 2 - lock.image.GetWidth() / 2; lock.y = Window.GetY() + Window.GetHeight() / 2 - global.box.image.GetHeight() / 3; lock.z = 10000; lock.sprite.SetPosition(lock.x, lock.y, lock.z); - + entry.sprite = Sprite(entry.image); entry.x = Window.GetX() + Window.GetWidth() / 2 - entry.image.GetWidth() / 2; entry.y = Window.GetY() + Window.GetHeight() / 2 - entry.image.GetHeight() / 2; @@ -224,7 +224,7 @@ fun dialog_setup() { for (i=0; i < PASSWORD_PROMPT_LINES; i++) { prompt[i] = Sprite(); - prompt[i].SetPosition(10, 50 + (20 * i), 10000); + prompt[i].SetPosition(10, 80 + (20 * i), 10000); } prompt.setText = fun (string) { @@ -238,7 +238,7 @@ fun dialog_setup() { prompt[i].SetImage(msg); } }; - + global.dialog.lock = lock; global.dialog.entry = entry; global.dialog.prompt = prompt; @@ -288,7 +288,7 @@ fun display_normal_callback () { global.logo.sprite.SetOpacity(1.0); } -# the callback function is called when the display should return to normal +# the callback function is called when the display should return to normal Plymouth.SetDisplayNormalFunction(display_normal_callback); ############ @@ -329,7 +329,7 @@ fun display_password_callback (prompt, bullets) { } } -# the callback function is called when the display should display a +# the callback function is called when the display should display a # password dialogue. First arg is prompt string, the second is the number of bullets. Plymouth.SetDisplayPasswordFunction(display_password_callback); @@ -339,7 +339,7 @@ Plymouth.SetDisplayPasswordFunction(display_password_callback); statusmsg.sprite = Sprite(); statusmsg.sprite.SetX(Window.GetX() + Window.GetWidth() / 2 - box.image.GetWidth() / 2 + 5); -statusmsg.sprite.SetY(Window.GetY() + Window.GetHeight() / 2 + box.image.GetHeight() / 2); +statusmsg.sprite.SetY(Window.GetY() + Window.GetHeight() / 2 + box.image.GetHeight() / 2 + 40); fun update_status_callback (text) { local.image = Image.Text(text, 0, 0, 0); @@ -360,12 +360,12 @@ fun update_status_callback (text) { else image = Image.Text("Checking disk " + device + " (" + progress + "% complete)", 0, 0, 0); } - statusmsg.sprite.SetImage(image); + statusmsg.sprite.SetImage(image); } # the callback function is called with the new boot status string Plymouth.SetUpdateStatusFunction(update_status_callback); - + ######## # quit # ######## @@ -397,7 +397,7 @@ fun question_callback (prompt, string) { global.ask.text.setText(string); } -# the callback function is called when the display should display a question +# the callback function is called when the display should display a question # dialogue. First arg is prompt string, the second is the entry contents. Plymouth.SetDisplayQuestionFunction(question_callback); @@ -405,14 +405,14 @@ Plymouth.SetDisplayQuestionFunction(question_callback); # message # ########### -# message +# message message.sprite = Sprite(); -message.sprite.SetPosition(10, 5, 10000); +message.sprite.SetPosition(10, 40, 10000); message.maxLength = 100; # fsck action line message_action.sprite = Sprite(); -message_action.sprite.SetPosition(10, 30, 10000); +message_action.sprite.SetPosition(10, 60, 10000); message_action.maxLength = 100; fun message_callback (text) { @@ -440,7 +440,7 @@ fun message_callback (text) { } } -# he callback function is called when new message should be displayed. +# the callback function is called when new message should be displayed. # First arg is message to display. Plymouth.SetMessageFunction(message_callback); @@ -455,8 +455,7 @@ fun refresh_callback () { index = Math.Int(logo.count % 48); global.logo.sprite.SetImage(logo[index].image); } - -# calling Plymouth.SetRefreshFunction with a function will set that + +# calling Plymouth.SetRefreshFunction with a function will set that # function to be called up to 50 times every second Plymouth.SetRefreshFunction (refresh_callback); - --