diff --git a/live-jessie/auto/config b/live-jessie/auto/config index 921dc8c..953c027 100755 --- a/live-jessie/auto/config +++ b/live-jessie/auto/config @@ -3,6 +3,6 @@ lb config noauto \ -b hdd --hdd-size 800 \ --architectures i386 -k "686-pae 586" \ - --apt-recommends false --firmware-chroot true --archive-areas "main contrib non-free" \ + --apt-recommends false --apt-indices false --firmware-chroot true --archive-areas "main contrib non-free" \ --bootappend-live "boot=live components persistence persistence-path=live quiet splash keyboard-layouts=fr locales=fr_FR.UTF-8" \ "${@}" diff --git a/live-jessie/config/bootloaders/syslinux/menu.cfg b/live-jessie/config/bootloaders/syslinux/menu.cfg index 721b22f..b36ebe8 100644 --- a/live-jessie/config/bootloaders/syslinux/menu.cfg +++ b/live-jessie/config/bootloaders/syslinux/menu.cfg @@ -1,7 +1,7 @@ menu hshift 0 menu width 82 -menu title Boot menu +menu title Boot menu include stdmenu.cfg include live.cfg diff --git a/live-jessie/config/includes.binary/persistence.xz b/live-jessie/config/includes.binary/live/persistence.xz similarity index 100% rename from live-jessie/config/includes.binary/persistence.xz rename to live-jessie/config/includes.binary/live/persistence.xz diff --git a/live-jessie/config/includes.chroot/etc/skel/.config/openbox/menu.xml b/live-jessie/config/includes.chroot/etc/skel/.config/openbox/menu.xml index b81d279..e9dc40b 100644 --- a/live-jessie/config/includes.chroot/etc/skel/.config/openbox/menu.xml +++ b/live-jessie/config/includes.chroot/etc/skel/.config/openbox/menu.xml @@ -19,10 +19,9 @@ - - sudo halt + sudo poweroff diff --git a/live-jessie/config/includes.chroot/etc/skel/.config/openbox/rc.xml b/live-jessie/config/includes.chroot/etc/skel/.config/openbox/rc.xml new file mode 100644 index 0000000..c432a08 --- /dev/null +++ b/live-jessie/config/includes.chroot/etc/skel/.config/openbox/rc.xml @@ -0,0 +1,798 @@ + + + + + 10 + 20 + + + yes + + no + + yes + + no + + 200 + + no + + + + Smart + +
yes
+ + Primary + + 1 + +
+ + Loupiottes + NLIMC + + yes + yes + + sans + 8 + + bold + + normal + + + + sans + 8 + + bold + + normal + + + + sans + 9 + + normal + + normal + + + + sans + 9 + + normal + + normal + + + + sans + 9 + + bold + + normal + + + + sans + 9 + + bold + + normal + + + + + + 1 + 1 + + + + 875 + + + + yes + Nonpixel + + Center + + + + 10 + + 10 + + + + + + 0 + 0 + 0 + 0 + + + TopLeft + + 0 + 0 + no + Above + + Vertical + + no + 300 + + 300 + + Middle + + + + C-g + + + + left + no + + + + + right + no + + + + + up + no + + + + + down + no + + + + + left + no + + + + + right + no + + + + + up + no + + + + + down + no + + + + + 1 + + + + + 2 + + + + + 3 + + + + + 4 + + + + + + + + + + + + + + + + + client-menu + + + + + + scrot -s + + + + + + + + + + + + + + + + + + + + + + + + yes + yes + + + + + + + + + + + right + + + + + left + + + + + up + + + + + down + + + + + + + true + Konqueror + + kfmclient openProfile filemanagement + + + + + + scrot + + + + + 1 + + 500 + + 400 + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + previous + + + + + next + + + + + previous + + + + + next + + + + + previous + + + + + next + + + + + + + + + + + + + no + + + + + + + + + + + yes + + + + + + + + + + + + + + + + + + + + + + + client-menu + + + + + + + top + + + + + + + left + + + + + + + right + + + + + + + bottom + + + + + + + client-menu + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + client-menu + + + + + + + client-menu + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + vertical + + + + + horizontal + + + + + + + + + + + + + + + + + previous + + + + + next + + + + + previous + + + + + next + + + + + previous + + + + + next + + + + + + + + + + + + + + + + client-list-combined-menu + + + + + root-menu + + + + + + + previous + + + + + next + + + + + previous + + + + + next + + + + + + + + + /var/lib/openbox/debian-menu.xml + menu.xml + 200 + + no + + 100 + + 400 + + yes + + yes + + + + + +
diff --git a/live-jessie/config/includes.chroot/etc/skel/.config/tint2/tint2rc b/live-jessie/config/includes.chroot/etc/skel/.config/tint2/tint2rc new file mode 100644 index 0000000..6305d34 --- /dev/null +++ b/live-jessie/config/includes.chroot/etc/skel/.config/tint2/tint2rc @@ -0,0 +1,118 @@ +# Tint2 config file +# Generated by tintwizard (http://code.google.com/p/tintwizard/) +# For information on manually configuring tint2 see http://code.google.com/p/tint2/wiki/Configure + +# Background definitions +# ID 1 +rounded = 7 +border_width = 2 +background_color = #000000 60 +border_color = #FFFFFF 16 + +# ID 2 +rounded = 5 +border_width = 0 +background_color = #FFFFFF 40 +border_color = #FFFFFF 48 + +# ID 3 +rounded = 5 +border_width = 0 +background_color = #FFFFFF 16 +border_color = #FFFFFF 68 + +# Panel +panel_monitor = all +panel_position = top center horizontal +panel_size = 94% 30 +panel_margin = 0 0 +panel_padding = 7 0 7 +panel_dock = 0 +wm_menu = 0 +panel_layer = top +panel_background_id = 1 + +# Panel Autohide +autohide = 0 +autohide_show_timeout = 0.3 +autohide_hide_timeout = 2 +autohide_height = 2 +strut_policy = follow_size + +# Taskbar +taskbar_mode = single_desktop +taskbar_padding = 2 3 2 +taskbar_background_id = 0 +taskbar_active_background_id = 0 + +# Tasks +urgent_nb_of_blink = 8 +task_icon = 1 +task_text = 1 +task_centered = 1 +task_maximum_size = 140 35 +task_padding = 6 2 +task_background_id = 3 +task_active_background_id = 2 +task_urgent_background_id = 2 +task_iconified_background_id = 3 +task_tooltip = 0 + +# Task Icons +task_icon_asb = 70 0 0 +task_active_icon_asb = 100 0 0 +task_urgent_icon_asb = 100 0 0 +task_iconified_icon_asb = 70 0 0 + +# Fonts +task_font = sans 7 +task_font_color = #FFFFFF 68 +task_active_font_color = #FFFFFF 83 +task_urgent_font_color = #FFFFFF 83 +task_iconified_font_color = #FFFFFF 68 +font_shadow = 0 + +# System Tray +systray = 1 +systray_padding = 0 4 5 +systray_sort = ascending +systray_background_id = 0 +systray_icon_size = 16 +systray_icon_asb = 70 0 0 + +# Clock +time1_format = %H:%M +time1_font = sans 8 +time2_format = %A %d %B +time2_font = sans 6 +clock_font_color = #FFFFFF 74 +clock_padding = 1 0 +clock_background_id = 0 +clock_rclick_command = orage + +# Tooltips +tooltip_padding = 2 2 +tooltip_show_timeout = 0.7 +tooltip_hide_timeout = 0.3 +tooltip_background_id = 1 +tooltip_font = sans 10 +tooltip_font_color = #000000 80 + +# Mouse +mouse_middle = none +mouse_right = close +mouse_scroll_up = toggle +mouse_scroll_down = iconify + +# Battery +battery = 0 +battery_low_status = 10 +battery_low_cmd = notify-send "battery low" +battery_hide = 98 +bat1_font = sans 8 +bat2_font = sans 6 +battery_font_color = #FFFFFF 74 +battery_padding = 1 0 +battery_background_id = 0 + +# End of config diff --git a/live-jessie/config/includes.chroot/etc/skel/autostart.sh b/live-jessie/config/includes.chroot/etc/skel/autostart.sh index 4cf87e2..1a8c95b 100755 --- a/live-jessie/config/includes.chroot/etc/skel/autostart.sh +++ b/live-jessie/config/includes.chroot/etc/skel/autostart.sh @@ -9,5 +9,5 @@ connman-ui-gtk & #xterm & #aconnectgui & volumeicon & -#mono /usr/local/bin/DMX-2.0.exe fullscreen live & +mono /usr/local/bin/DMX-2.0.exe fs live & diff --git a/live-jessie/config/includes.chroot/lib/live/config/0095-update b/live-jessie/config/includes.chroot/lib/live/config/0005-update similarity index 57% rename from live-jessie/config/includes.chroot/lib/live/config/0095-update rename to live-jessie/config/includes.chroot/lib/live/config/0005-update index a81d4e5..f2fcd20 100755 --- a/live-jessie/config/includes.chroot/lib/live/config/0095-update +++ b/live-jessie/config/includes.chroot/lib/live/config/0005-update @@ -11,11 +11,15 @@ Update () { - if [ -e /lib/live/mount/medium/live/loupiottes-update.txz ] + livelnk=`/sbin/losetup /dev/loop0 | /bin/sed -ne 's!^.*\(/lib/live/.*\)live/filesystem.squashfs.*$!\1!p'` + + if [ -e $livelnk/loupiottes-update.txz ] then - tar xJf /lib/live/mount/medium/live/loupiottes-update.txz -C / + tar xJf $livelnk/loupiottes-update.txz -C / fi + [ -e /usr/local/sbin/update.sh ] && /usr/local/sbin/update.sh + return } diff --git a/live-jessie/config/includes.chroot/lib/live/config/0096-live-link b/live-jessie/config/includes.chroot/lib/live/config/0096-live-link index aeece8a..96eb262 100755 --- a/live-jessie/config/includes.chroot/lib/live/config/0096-live-link +++ b/live-jessie/config/includes.chroot/lib/live/config/0096-live-link @@ -18,12 +18,14 @@ LIVELink () if [ -e /home/${LIVE_USERNAME}/LIVE ] then - return + rm /home/${LIVE_USERNAME}/LIVE fi + livelnk=`/sbin/losetup /dev/loop0 | /bin/sed -ne 's!^.*\(/lib/live/.*\)live/filesystem.squashfs.*$!\1!p'` + echo -n " live-link" - ln -s /lib/live/mount/medium /home/${LIVE_USERNAME}/LIVE + ln -s $livelnk /home/${LIVE_USERNAME}/LIVE } diff --git a/live-jessie/config/includes.chroot/usr/local/sbin/update.sh b/live-jessie/config/includes.chroot/usr/local/sbin/update.sh new file mode 100755 index 0000000..1fa5d57 --- /dev/null +++ b/live-jessie/config/includes.chroot/usr/local/sbin/update.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +touch /updated diff --git a/live-jessie/config/includes.chroot/usr/share/themes/Loupiottes/openbox-3/themerc b/live-jessie/config/includes.chroot/usr/share/themes/Loupiottes/openbox-3/themerc new file mode 100644 index 0000000..586ca2f --- /dev/null +++ b/live-jessie/config/includes.chroot/usr/share/themes/Loupiottes/openbox-3/themerc @@ -0,0 +1,164 @@ +!# Clearlooks-Loupiottes +!# Clearlooks as it evolves in gnome-git... +!# Last updated 09/03/10 + +# Fonts +# these are really halos, but who cares? + +*.font: shadow=n +window.active.label.text.font:shadow=y:shadowtint=30:shadowoffset=1 +window.inactive.label.text.font:shadow=y:shadowtint=00:shadowoffset=0 +menu.items.font:shadow=y:shadowtint=0:shadowoffset=1 + +!# general stuff + +border.width: 1 +padding.width: 3 +padding.height: 2 +window.handle.width: 3 +window.client.padding.width: 0 +menu.overlap: 2 +*.justify: center + +!# lets set our damn shadows here, eh? + +*.bg.highlight: 50 +*.bg.shadow: 05 + +window.active.title.bg.highlight: 35 +window.active.title.bg.shadow: 05 + +window.inactive.title.bg.highlight: 30 +window.inactive.title.bg.shadow: 05 + +window.*.grip.bg.highlight: 50 +window.*.grip.bg.shadow: 30 + +window.*.handle.bg.highlight: 50 +window.*.handle.bg.shadow: 30 + +!# Menu settings + +menu.border.color: #aaaaaa +menu.border.width: 1 + +menu.title.bg: solid flat +menu.title.bg.color: #E6E7E6 +menu.title.text.color: #111111 + +menu.items.bg: Flat Solid +menu.items.bg.color: #ffffff +menu.items.text.color: #111111 +menu.items.disabled.text.color: #aaaaaa + +menu.items.active.bg: Flat Gradient splitvertical border + +menu.items.active.bg.color: #97b8e2 +menu.items.active.bg.color.splitTo: #a8c5e9 + +menu.items.active.bg.colorTo: #91b3de +menu.items.active.bg.colorTo.splitTo: #80a7d6 +menu.items.active.bg.border.color: #4b6e99 +menu.items.active.text.color: #ffffff + +menu.separator.width: 1 +menu.separator.padding.width: 0 +menu.separator.padding.height: 3 +menu.separator.color: #aaaaaa + +!# set handles here and only the once? + +window.*.handle.bg: Raised solid +window.*.handle.bg.color: #666666 + +window.*.grip.bg: Raised solid +window.*.grip.bg.color: #666666 + +!# Active + +window.*.border.color: #585a5d + +window.active.title.separator.color: #4e4e4e + +*.title.bg: Raised Gradient splitvertical +*.title.bg.color: #808080 +*.title.bg.color.splitTo: #666666 +*.title.bg.colorTo: #808080 +*.title.bg.colorTo.splitTo: #666666 + +window.active.label.bg: Parentrelative +window.active.label.text.color: #ffffff + +window.active.button.*.bg: Flat Gradient splitvertical Border + +window.active.button.*.bg.color: #C0C0C0 +window.active.button.*.bg.color.splitTo: #909090 +window.active.button.*.bg.colorTo: #C0C0C0 +window.active.button.*.bg.colorTo.splitTo: #A0A0A0 + +window.active.button.*.bg.border.color: #A0A0A0 +window.active.button.*.image.color: #F4F5F6 + +window.active.button.hover.bg.color: #b5d3ef +window.active.button.hover.bg.color.splitTo: #b5d3ef +window.active.button.hover.bg.colorTo: #9cbae7 +window.active.button.hover.bg.colorTo.splitTo: #8caede +window.active.button.hover.bg.border.color: #4A658C +window.active.button.hover.image.color: #ffffff + +window.active.button.pressed.bg: Flat solid Border +window.active.button.pressed.bg.color: #7aa1d2 + +window.active.button.hover.bg.border.color: #4A658C + +!# inactive + +!#window.inactive.border.color: #7e8285 +window.inactive.title.separator.color: #96999d + +window.inactive.title.bg: Raised Gradient splitvertical +window.inactive.title.bg.color: #505050 +window.inactive.title.bg.color.splitTo: #505050 +window.inactive.title.bg.colorTo: #505050 +window.inactive.title.bg.colorTo.splitTo: #505050 + +window.inactive.label.bg: Parentrelative +window.inactive.label.text.color: #70747d + +window.inactive.button.*.bg: Flat Gradient splitVertical Border +window.inactive.button.*.bg.color: #505050 +window.inactive.button.*.bg.color.splitto: #505050 +window.inactive.button.*.bg.colorTo: #505050 +window.inactive.button.*.bg.colorTo.splitto: #505050 +window.inactive.button.*.bg.border.color: #454545 +window.inactive.button.*.image.color: #6D6C6C + + +!# osd (pop ups and what not, dock?) + +osd.border.width: 1 +osd.border.color: #aaaaaa + +osd.bg: flat border gradient splitvertical +osd.bg.color: #F0EFEE +osd.bg.color.splitto: #f5f5f4 +osd.bg.colorTo: #EAEBEC +osd.bg.colorTo.splitto: #E7E5E4 + +osd.bg.border.color: #ffffff + +osd.active.label.bg: parentrelative +osd.active.label.bg.color: #efefef +osd.active.label.bg.border.color: #9c9e9c +osd.active.label.text.color: #444 + +osd.inactive.label.bg: parentrelative +osd.inactive.label.text.color: #70747d + +!# yeah whatever, this is fine anyhoo? +osd.hilight.bg: flat vertical gradient +osd.hilight.bg.color: #9ebde5 +osd.hilight.bg.colorTo: #749dcf +osd.unhilight.bg: flat vertical gradient +osd.unhilight.bg.color: #BABDB6 +osd.unhilight.bg.colorTo: #efefef