Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fvbe.git;a=commitdiff;h=705a69c18fde8aeee31e0715064bdcc6e9601b5f
commit 705a69c18fde8aeee31e0715064bdcc6e9601b5f Author: crazy <[email protected]> Date: Sat Jul 29 11:31:33 2017 +0200 fvbe: a lot fixes * change fvbe_chroot() to always tun /bin/bash -c .. * fix for fvbe* cache* functions() * workaround dracut / kernel issues *again* ( still need to work on the grub files ) * on e and gnome just autostart calamares * remove files are now in calamares packages * fix for e rodepends=() in fvbe-skel.conf diff --git a/bin/fvbe-make-iso b/bin/fvbe-make-iso index 34c48c7..e5f72a3 100755 --- a/bin/fvbe-make-iso +++ b/bin/fvbe-make-iso @@ -121,7 +121,7 @@ fvbe_umount() { fvbe_chroot() { if [[ -d ${FVBE_ROOT} ]]; then - /usr/sbin/chroot ${FVBE_ROOT} "$@" + /usr/sbin/chroot ${FVBE_ROOT} /bin/bash -c "$@" else fvbe_error_msg "Huh.. FVBE_ROOT does not exist , typo?" fi @@ -173,8 +173,19 @@ fvbe_create_users() { echo "guest:x:1006:100:Guest user:/home/guest:/bin/bash" >> ${FVBE_ROOT}/etc/passwd fvbe_plain_msg "Fixing 'guest' users home.." - cp -r guest ${FVBE_ROOT}/home/ - fvbe_chroot /usr/bin/chown -R guest.users /home/guest + cp -ra guest ${FVBE_ROOT}/home/ + mkdir -p ${FVBE_ROOT}/home/guest/.config/autostart + if [[ ${FVBE_ISO_TYPE} == "enlightenment" ]]; then + mkdir -p ${FVBE_ROOT}/home/guest/.e/e/applications/startup + ## HOW weird.. + echo "~/.config/autostart/calamares-frugalware.desktop" > ${FVBE_ROOT}/home/guest/.e/e/applications/startup/.order + fvbe_chroot "mv -v /home/guest/Desktop/calamares-frugalware.desktop /home/guest/.config/autostart/calamares-frugalware.desktop" + fi + + if [[ ${FVBE_ISO_TYPE} == "gnome" ]]; then + fvbe_chroot "mv -v /home/guest/Desktop/calamares-frugalware.desktop /home/guest/.config/autostart/calamares-frugalware.desktop" + fi + fvbe_chroot "/usr/bin/chown -R guest.users /home/guest" } fvbe_create_system_files() { @@ -221,25 +232,22 @@ fvbe_calamares_files() { session=plasma.desktop elif [[ ${FVBE_ISO_TYPE} == "enlightenment" ]]; then session=enlightenment.desktop + ## bleh such weird + sed -i "s|^Icon=.*|Icon=/usr/share/icons/hicolor/scalable/apps/calamares-frugalware.svg|" ${FVBE_ROOT}/usr/share/applications/calamares-frugalware.desktop fi - fvbe_plain_msg "Setting SDDM Session=$session" [[ ! -d ${cala} ]] && mkdir -p ${cala} [[ ! -d ${cala_files} ]] && mkdir -p ${cala_files} - fvbe_warn_msg "${FUNCNAME[0]}(): Fix config files for basic type.." + ## Fixme - rsync stuff cp -r calamares/calamares-config-global/* ${cala} cp -r calamares/calamares-frugalware-branding/* ${cala_files} sed -i "s/_version_/$FVBE_ISO_RELEASE/" ${FVBE_ROOT}/usr/share/calamares/branding/frugalware/branding.desc sed -i "s/_versionedname_/$(cat $FVBE_ROOT/etc/frugalware-release)/" ${FVBE_ROOT}/usr/share/calamares/branding/frugalware/branding.desc - install -Dm644 calamares/calamares-frugalware.desktop ${FVBE_ROOT}/usr/share/applications/calamares-frugalware.desktop - install -Dm644 calamares/calamares-frugalware.svg ${FVBE_ROOT}/usr/share/icons/hicolor/scalable/apps/calamares-frugalware.svg - - cp -r calamares/polkit/49-nopasswd_calamares.rules ${FVBE_ROOT}/etc/polkit-1/rules.d/ - if [[ -f "${FVBE_ROOT}/etc/sddm.conf" ]]; then + fvbe_plain_msg "Setting SDDM Session=$session" sed -i "s|^Session=.*\$|Session=$session|" ${FVBE_ROOT}/etc/sddm.conf sed -i "s|^User=.*\$|User=guest|" ${FVBE_ROOT}/etc/sddm.conf fi @@ -253,22 +261,30 @@ fvbe_calamares_files() { fvbe_cache_files() { - cp ${FVBE_ROOT}/boot/vmlinuz* . - cp ${FVBE_ROOT}/boot/initrd* . + cp ${FVBE_ROOT}/boot/vmlinuz-* . + cp ${FVBE_ROOT}/boot/initrd-* . cp ${FVBE_ROOT}/usr/share/grub/unicode.pf2 unicode.pf2 cp ${FVBE_ROOT}/boot/grub/background.png background.png } fvbe_copy_chached_files() { - for file in vmlinuz* - do - cp $file ${FVBE_ROOT}/boot/vmlinuz - done - for file in initrd* - do - cp $file ${FVBE_ROOT}/boot/initrd - done + local ifile vfile + + ifile=$(basename initrd-*) + vfile=$(basename vmlinuz-*) + + if [[ ! -e ${ifile} ]]; then + fvbe_error_msg "Missing initrd , abording.." + fi + + if [[ ! -e ${vfile} ]]; then + fvbe_error_msg "Missing vmlinuz , abording.." + fi + + fvbe_info_msg "Setting ifile=$ifile , vfile=$vfile.." + cp $vfile ${FVBE_ROOT}/boot/vmlinuz + cp $ifile ${FVBE_ROOT}/boot/initrd cp unicode.pf2 ${FVBE_ROOT}/boot/grub/fonts/unicode.pf2 cp background.png ${FVBE_ROOT}/boot/grub/background.png } @@ -389,7 +405,7 @@ fi cp /etc/resolv.conf ${FVBE_ROOT}/etc ## now install the rest -fvbe_chroot pacman-g2 --noconfirm -Sy ${FVBE_ROOTFS_PACKAGES[*]} +fvbe_chroot "pacman-g2 --noconfirm -Sy ${FVBE_ROOTFS_PACKAGES[*]}" ## root && guest fvbe_create_users @@ -407,9 +423,10 @@ fvbe_calamares_files fvbe_cache_files if [[ ${FVBE_ISO_TYPE} == "enlightenment" ]]; then + ## Special .. ## they use connman for networking so disable NM and enable connman - fvbe_chroot /bin/systemctl disable NetworkManager - fvbe_chroot /bin/systemctl enable connman + fvbe_chroot "/bin/systemctl disable NetworkManager" + fvbe_chroot "/bin/systemctl enable connman" fi ## umount @@ -420,9 +437,8 @@ rm -rf ${FVBE_ROOT:?}/* mkdir -p ${FVBE_ROOT}/LiveOS mv rootfs.img ${FVBE_ROOT}/LiveOS/ -## FIXME: why lz4 ? we use xz for other stuff ?! fvbe_info_msg "Creating squashfs.img.." -mksquashfs ${FVBE_ROOT} squashfs.img -noappend -no-progress -always-use-fragments -comp lz4 -Xhc -e boot >/dev/null 2>&1 +mksquashfs ${FVBE_ROOT} squashfs.img -noappend -no-progress -comp xz -Xbcj x86 -Xdict-size 100% >/dev/null 2>&1 rm -rf ${FVBE_ROOT} *.iso tmp sums var diff --git a/boot-files/grub.cfg b/boot-files/grub.cfg index ad2532a..fcca178 100644 --- a/boot-files/grub.cfg +++ b/boot-files/grub.cfg @@ -18,11 +18,12 @@ function load_video { loadfont /boot/grub/fonts/unicode.pf2 -set gfxmode=1366x768x32,1024x768x32,auto +set gfxmode=auto load_video insmod png insmod gfxterm insmod gettext +terminal_input console terminal_output gfxterm insmod gfxmenu insmod part_gpt @@ -61,16 +62,9 @@ set menu_color_normal=white/black set menu_color_highlight=black/white -menuentry 'Frugalware Versatile Bootable Environment' { - set gfxpayload=keep - echo "Booting..." - echo " Language set to: ${bootlang}" - echo " Keyboard set to: ${bootkeymap}" - if [ x$acpi_opt != x ]; then - echo " ACPI option: ${acpi_opt}" - fi - echo "Please wait..." - linux /boot/vmlinuz root=live:CDLABEL=FVBE rd.live.image vconsole.keymap=${bootkeymap} vconsole.font=ter-v16b locale.LANG=${bootlang} rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 quiet audit=0 ${acpi_opt} ${blacklist} -- +menuentry 'Frugalware Versatile Bootable Environment' --class frugalware --class gnu-linux --class gnu --class os { + + linux /boot/vmlinuz root=live:CDLABEL=FVBE rd.live.image vconsole.keymap=${bootkeymap} vconsole.font=ter-v16b locale.LANG=${bootlang} rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 quiet systemd.show_status=1 audit=0 ${acpi_opt} -- initrd /boot/initrd } @@ -89,15 +83,6 @@ menuentry 'Disable PCI ACPI only..' { configfile /boot/grub/grub.cfg } -menuentry 'Disable VirtualBox video' { - echo "Disabling VirtualBox video.." - set blacklist="rd.driver.blacklist=vboxvideo" - export blacklist - configfile /boot/grub/grub.cfg -} - - - submenu 'Locales Selection' { menuentry 'aa_DJ.utf8' { echo Switching to: aa_DJ.utf8 diff --git a/calamares/calamares-config-global/modules/packages.conf b/calamares/calamares-config-global/modules/packages.conf index eb4bf01..b2b11f1 100644 --- a/calamares/calamares-config-global/modules/packages.conf +++ b/calamares/calamares-config-global/modules/packages.conf @@ -51,4 +51,4 @@ operations: - remove: - calamares-frugalware - virtualbox-guest-additions - - xinit + - xf86-video-vmware diff --git a/calamares/calamares-config-gnome/modules/packages.conf b/calamares/calamares-config-gnome/modules/packages.conf index b3a39b8..b2b11f1 100644 --- a/calamares/calamares-config-gnome/modules/packages.conf +++ b/calamares/calamares-config-gnome/modules/packages.conf @@ -51,3 +51,4 @@ operations: - remove: - calamares-frugalware - virtualbox-guest-additions + - xf86-video-vmware diff --git a/calamares/calamares-config-plasma/modules/packages.conf b/calamares/calamares-config-plasma/modules/packages.conf index 47c8cac..b2b11f1 100644 --- a/calamares/calamares-config-plasma/modules/packages.conf +++ b/calamares/calamares-config-plasma/modules/packages.conf @@ -51,4 +51,4 @@ operations: - remove: - calamares-frugalware - virtualbox-guest-additions - + - xf86-video-vmware diff --git a/calamares/calamares-frugalware.desktop b/calamares/calamares-frugalware.desktop deleted file mode 100644 index e6f1171..0000000 --- a/calamares/calamares-frugalware.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Type=Application -Version=1.0 -Name=Install FrugalWare -GenericName=FrugalWare Installer -Keywords=calamares;system;installer;frugalware -TryExec=calamares -Exec=sudo /usr/bin/calamares -Comment=Calamares â System Installer for FrugalWare -Icon=calamares-frugalware -Terminal=false -StartupNotify=true -Categories=Qt;System; diff --git a/calamares/calamares-frugalware.svg b/calamares/calamares-frugalware.svg deleted file mode 100644 index 01acaeb..0000000 --- a/calamares/calamares-frugalware.svg +++ /dev/null @@ -1,399 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/"; - xmlns:cc="http://creativecommons.org/ns#"; - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - xmlns:svg="http://www.w3.org/2000/svg"; - xmlns="http://www.w3.org/2000/svg"; - xmlns:xlink="http://www.w3.org/1999/xlink"; - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; - width="51.200001" - height="51.200001" - id="svg5453" - version="1.1" - inkscape:version="0.92.1 r" - sodipodi:docname="calamares-frugalware.svg" - inkscape:export-filename="/home/jamboarder/Projects/KDE VDG/Calamares/calamares-icon-2.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" - viewBox="0 0 48 48"> - <defs - id="defs5455"> - <linearGradient - id="linearGradient5623"> - <stop - id="stop5625" - offset="0" - style="stop-color:#d35400;stop-opacity:1;" /> - <stop - style="stop-color:#d35400;stop-opacity:1;" - offset="1" - id="stop5627" /> - </linearGradient> - <linearGradient - id="linearGradient3819"> - <stop - style="stop-color:#eff0f1;stop-opacity:1;" - offset="0" - id="stop3821" /> - <stop - style="stop-color:#bdc3c7;stop-opacity:1;" - offset="1" - id="stop3823" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3819" - id="linearGradient3825" - x1="24" - y1="20" - x2="24" - y2="43.999973" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(384.57143,499.798)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4227" - id="linearGradient3843" - x1="10" - y1="36" - x2="15" - y2="41" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(384.57143,500.798)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4227" - id="linearGradient3847" - gradientUnits="userSpaceOnUse" - x1="9.9047623" - y1="36" - x2="14.90477" - y2="41.000008" - gradientTransform="translate(398.66666,500.798)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5623" - id="linearGradient3948" - x1="25.065147" - y1="33.843651" - x2="25" - y2="10" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,1.0833332,384.57143,492.96467)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4227" - id="linearGradient3080" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.3793103,0,0,1.3793103,384.81281,499.0393)" - x1="8.5250006" - y1="7.8000579" - x2="25.200001" - y2="25.200058" /> - <linearGradient - id="linearGradient4227" - inkscape:collect="always"> - <stop - id="stop4229" - offset="0" - style="stop-color:#292c2f;stop-opacity:1" /> - <stop - id="stop4231" - offset="1" - style="stop-color:#000000;stop-opacity:0;" /> - </linearGradient> - <filter - style="color-interpolation-filters:sRGB" - id="filter3845" - inkscape:label="Drop Shadow"> - <feFlood - id="feFlood3847" - flood-opacity="0.5" - flood-color="rgb(0,0,0)" - result="flood" /> - <feComposite - id="feComposite3849" - in2="SourceGraphic" - in="flood" - operator="in" - result="composite1" /> - <feGaussianBlur - id="feGaussianBlur3851" - stdDeviation="6" - result="blur" /> - <feOffset - id="feOffset3853" - dx="0" - dy="4" - result="offset" /> - <feComposite - id="feComposite3855" - in2="offset" - in="SourceGraphic" - operator="over" - result="composite2" /> - </filter> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:zoom="5.427043" - inkscape:cx="-0.29007461" - inkscape:cy="48.206945" - inkscape:document-units="px" - inkscape:current-layer="layer1" - showgrid="true" - fit-margin-top="0" - fit-margin-left="0" - fit-margin-right="0" - fit-margin-bottom="0" - inkscape:window-width="1920" - inkscape:window-height="1051" - inkscape:window-x="1920" - inkscape:window-y="0" - inkscape:window-maximized="1" - inkscape:showpageshadow="false" - borderlayer="true" - showguides="true" - inkscape:snap-global="true" - inkscape:snap-nodes="true" - inkscape:snap-bbox="true" - inkscape:bbox-nodes="true" - inkscape:object-nodes="true"> - <inkscape:grid - type="xygrid" - id="grid4063" - empspacing="4" - visible="true" - enabled="true" - snapvisiblegridlinesonly="true" - originx="0" - originy="0" - spacingx="1" - spacingy="1" /> - <sodipodi:guide - position="1.1650391e-05,47.999995" - orientation="4,0" - id="guide4146" - inkscape:locked="false" /> - <sodipodi:guide - position="1.1650391e-05,43.999995" - orientation="0,48" - id="guide4148" - inkscape:locked="false" /> - <sodipodi:guide - position="48.000011,43.999995" - orientation="-4,0" - id="guide4150" - inkscape:locked="false" /> - <sodipodi:guide - position="1.1650391e-05,4.0000263" - orientation="4,0" - id="guide4154" - inkscape:locked="false" /> - <sodipodi:guide - position="1.1650391e-05,2.6367188e-05" - orientation="0,48" - id="guide4156" - inkscape:locked="false" /> - <sodipodi:guide - position="48.000011,2.6367188e-05" - orientation="-4,0" - id="guide4158" - inkscape:locked="false" /> - <sodipodi:guide - position="48.000011,4.0000263" - orientation="0,-48" - id="guide4160" - inkscape:locked="false" /> - <sodipodi:guide - position="48.000011,48.000025" - orientation="0,-4" - id="guide4162" - inkscape:locked="false" /> - <sodipodi:guide - position="44.000011,48.000025" - orientation="48,0" - id="guide4164" - inkscape:locked="false" /> - <sodipodi:guide - position="44.000011,2.6367188e-05" - orientation="0,4" - id="guide4166" - inkscape:locked="false" /> - <sodipodi:guide - position="48.000011,2.6367188e-05" - orientation="-48,0" - id="guide4168" - inkscape:locked="false" /> - <sodipodi:guide - position="4.0000421,48.000025" - orientation="0,-4" - id="guide4170" - inkscape:locked="false" /> - <sodipodi:guide - position="4.2167968e-05,48.000025" - orientation="48,0" - id="guide4172" - inkscape:locked="false" /> - <sodipodi:guide - position="4.2167968e-05,2.6367188e-05" - orientation="0,4" - id="guide4174" - inkscape:locked="false" /> - <sodipodi:guide - position="4.0000421,2.6367188e-05" - orientation="-48,0" - id="guide4176" - inkscape:locked="false" /> - <sodipodi:guide - position="4.0000116,47.999995" - orientation="43.999969,0" - id="guide4638" - inkscape:locked="false" /> - <sodipodi:guide - position="4.0000116,4.0000263" - orientation="0,20" - id="guide4640" - inkscape:locked="false" /> - <sodipodi:guide - position="24.000012,47.999995" - orientation="0,-20" - id="guide4644" - inkscape:locked="false" /> - <sodipodi:guide - position="4.0000421,24.000026" - orientation="20,0" - id="guide4666" - inkscape:locked="false" /> - <sodipodi:guide - position="4.0000421,4.0000263" - orientation="0,39.999969" - id="guide4668" - inkscape:locked="false" /> - <sodipodi:guide - position="44.000011,4.0000263" - orientation="-20,0" - id="guide4670" - inkscape:locked="false" /> - </sodipodi:namedview> - <metadata - id="metadata5458"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /> - <dc:title /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Capa 1" - inkscape:groupmode="layer" - id="layer1" - transform="translate(-384.57143,-499.798)"> - <rect - style="fill:url(#linearGradient3948);fill-opacity:1;stroke:none" - id="rect3936" - width="32" - height="25.999996" - x="392.57144" - y="503.798" - ry="0" /> - <path - style="opacity:0.2;fill:#232629;fill-opacity:1;stroke:none" - d="m 408.57143,533.798 c -1.662,0 -3,1.338 -3,3 0,1.662 1.338,3 3,3 1.30536,0 2.39817,-0.84052 2.8125,-2 h 8.375 c 0.41433,1.15948 1.50714,2 2.8125,2 1.662,0 3,-1.338 3,-3 0,-1.662 -1.338,-3 -3,-3 -1.30536,0 -2.39817,0.84052 -2.8125,2 h -8.375 c -0.41433,-1.15948 -1.50714,-2 -2.8125,-2 z" - id="path3911" - inkscape:connector-curvature="0" /> - <path - style="fill:url(#linearGradient3825);fill-opacity:1;stroke:none" - d="m 388.57144,529.798 -10e-6,14 h 40 l 10e-6,-14 z" - id="rect3804" - inkscape:connector-curvature="0" - sodipodi:nodetypes="ccccc" /> - <path - inkscape:connector-curvature="0" - id="path3829" - d="m 411.38393,537.798 h 8.375 c 0.41433,1.15948 1.50714,2 2.8125,2 1.662,0 3,-1.338 3,-3 0,-1.662 -1.338,-3 -3,-3 -1.30536,0 -2.39817,0.84052 -2.8125,2 h -8.375 c 0.1875,1 0.1875,1 0,2 z" - style="opacity:0.77876108;fill:#4d4d4d;fill-opacity:1;stroke:none" - sodipodi:nodetypes="ccsssccc" /> - <path - sodipodi:nodetypes="ccccc" - inkscape:connector-curvature="0" - id="path3845" - d="m 406.66666,539.13133 4.76191,4.66667 h 8.14286 l -9.14286,-9.42857 z" - style="opacity:0.2;fill:url(#linearGradient3847);fill-opacity:1;stroke:none" /> - <path - style="opacity:0.2;fill:url(#linearGradient3843);fill-opacity:1;stroke:none" - d="m 392.57143,539.13133 4.61905,4.66667 h 13.38095 l -4.86671,-6.9365 -7.13329,-0.0675 -2.23809,-2.42461 z" - id="path3835" - inkscape:connector-curvature="0" - sodipodi:nodetypes="ccccccc" /> - <path - style="fill:#d35400;fill-opacity:1;stroke:none" - d="m 394.57143,533.798 c -1.662,0 -3,1.338 -3,3 0,1.662 1.338,3 3,3 1.30536,0 2.39817,-0.84052 2.8125,-2 h 8.375 c 0.41433,1.15948 1.50714,2 2.8125,2 1.662,0 3,-1.338 3,-3 0,-1.662 -1.338,-3 -3,-3 -1.30536,0 -2.39817,0.84052 -2.8125,2 h -8.375 c -0.41433,-1.15948 -1.50714,-2 -2.8125,-2 z" - id="rect3812" - inkscape:connector-curvature="0" /> - <rect - ry="0" - y="542.79797" - x="388.57147" - height="0.99997008" - width="39.999954" - id="rect3827" - style="fill:#95a5a6;fill-opacity:1;stroke:none" /> - <rect - style="fill:#eff0f1;fill-opacity:1;stroke:none" - id="rect3855" - width="39.999969" - height="1.0000263" - x="388.57147" - y="529.79797" - ry="0" /> - <path - inkscape:connector-curvature="0" - style="opacity:0.2;fill:url(#linearGradient3080);fill-opacity:1;fill-rule:evenodd;stroke:none" - d="m 409.57143,513.798 v 1 l -1,9 20.00001,19 v 0 0 l -10e-6,-1 10e-6,-13 -19.00001,-19 z" - id="path4184" - sodipodi:nodetypes="cccccccccc" /> - <path - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#fcfcfc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" - d="m 406.57143,509.798 v 10 l -4.5,-4.5 -1.5,1.5 7,7 7,-7 -1.5,-1.5 -4.5,4.5 v -10 z" - id="path3938" - inkscape:connector-curvature="0" /> - <g - id="g3862" - transform="matrix(0.07257427,0,0,0.07857465,405.44841,485.92303)"> - <path - id="path2985" - d="m 190.84375,199.21875 c -70.69245,0 -128,57.30755 -128,128 0,70.69245 57.30755,128 128,128 70.69245,0 128,-57.30755 128,-128 0,-70.69245 -57.30755,-128 -128,-128 z m -64.5625,54.65625 h 127.75 c 6.71549,0 12.125,5.40951 12.125,12.125 v 127.75 c 0,6.71549 -5.40951,12.125 -12.125,12.125 h -127.75 c -6.71549,0 -12.125,-5.40951 -12.125,-12.125 V 266 c 0,-6.71549 5.40951,-12.125 12.125,-12.125 z" - clip-path="none" - style="fill:#00548b;fill-opacity:1;stroke:#143b69;stroke-width:1.04186046;stroke-opacity:1;filter:url(#filter3845)" - inkscape:connector-curvature="0" /> - <g - id="layer4" - transform="matrix(3.0576213,0,0,3.0576213,43.189537,180.55344)"> - <path - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#143b69;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" - id="path3914" - d="M 36,31.03125 A 0.95511873,0.95511873 0 0 0 35.03125,32 V 66 A 0.95511873,0.95511873 0 0 0 36,66.96875 H 46 A 0.95511873,0.95511873 0 0 0 46.96875,66 V 54.96875 H 58 A 0.95511873,0.95511873 0 0 0 58.96875,54 V 46 A 0.95511873,0.95511873 0 0 0 58,45.03125 H 46.96875 v -4.0625 H 62 A 0.95511873,0.95511873 0 0 0 62.96875,40 V 32 A 0.95511873,0.95511873 0 0 0 62,31.03125 Z" - inkscape:connector-curvature="0" /> - <path - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#00548b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" - id="rect2922" - inkscape:connector-curvature="0" - d="M 36,32 V 66 H 46 V 54 H 58 V 46 H 46 v -6 h 16 v -8 z" /> - </g> - </g> - </g> -</svg> diff --git a/calamares/polkit/49-nopasswd_calamares.rules b/calamares/polkit/49-nopasswd_calamares.rules deleted file mode 100644 index cb5a56b..0000000 --- a/calamares/polkit/49-nopasswd_calamares.rules +++ /dev/null @@ -1,9 +0,0 @@ -/* Allow user guest to execute calamares - * without password authentication, similar to "sudo NOPASSWD:" - */ -polkit.addRule(function(action, subject) { - if (action.id == "com.github.calamares.calamares.pkexec.run" && subject.user == "guest") - { - return polkit.Result.YES; - } -}); diff --git a/fvbe-skel.conf b/fvbe-skel.conf index 722d3f5..09a8778 100644 --- a/fvbe-skel.conf +++ b/fvbe-skel.conf @@ -14,10 +14,10 @@ FVBE_ROOTFS_SIZE="5" FVBE_ROOTFS_REPOSITORY="current" # the packages or package groups to install -FVBE_ROOTFS_PACKAGES_BASIC="scriptlet-core base syslinux openssh virtualbox-guest-additions calamares-frugalware dracut pkgconfig gnupg2 xinit xrandr fonts-extra noto-emoji" +FVBE_ROOTFS_PACKAGES_BASIC="scriptlet-core base openssh virtualbox-guest-additions calamares-frugalware dracut pkgconfig gnupg2 xinit xrandr fonts-extra noto-emoji xf86-video-vmware" FVBE_ROOTFS_PACKAGES_PLASMA="sddm kf5 plasma kio-gdrive vlc partitionmanager kapman dolphin dolphin-plugins konsole kate spectacle gwenview okular ark kdegraphics-thumbnailers kdesdk-thumbnailers ffmpegthumbs qupzilla" FVBE_ROOTFS_PACKAGES_GNOME="gdm gnome polkit-gnome" -FVBE_ROOTFS_PACKAGES_E="sddm connman econnman efl enlightenment python-efl terminology vlc qupzilla kate" +FVBE_ROOTFS_PACKAGES_E="sddm connman econnman efl enlightenment python-efl terminology vlc qupzilla kate xorg-server xset xsetroot mkfontdir xprop setxkbmap" # the hostname to use at runtime FVBE_ROOTFS_HOSTNAME="fvbe"
_______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
