Compare commits

...

41 Commits

Author SHA1 Message Date
Michael Shigorin
c1be1d5bcb 1.1.78-alt1
- regular-enlightenment
2015-11-09 20:36:41 +03:00
Michael Shigorin
16aa4dbcef base+smartcard: added pam_p11
This is what Aladdin folks asked for.
2015-11-09 20:31:45 +03:00
Dmitriy Khanzhin
1c44272f00 pkg.in/lists/sysvinit: added systemd-services- for remove him as well 2015-11-08 17:00:06 +03:00
Michael Shigorin
7e29ad9c18 regular.mk: updated server-samba4
Adjust accordingly to the pkglist having been renamed.
2015-11-06 19:01:02 +03:00
Michael Shigorin
e1721ddec7 server+sambaAD: renamed to server+sambaDC, pruned
samba-DC-4.3.1-alt1 package set introduced task-samba-dc metapackage,
let's use that one while still carrying around what's missing there
and got collected here.
2015-11-06 19:00:43 +03:00
Michael Shigorin
3014fde9fd regular.mk: enable ntpd for desktops
...if any (and there should be some now).
2015-11-03 18:13:17 +03:00
Michael Shigorin
d437a3e971 desktop+regular, regular+tde: commoditize NTP support
It's just wrong to see arbitrary time when LiveCD gets booted,
sem@ tells he runs openntpd in Simply; let's do the same.
2015-11-03 18:13:16 +03:00
Michael Shigorin
d5d5377079 desktop+lxqt+extra: disable arandr
It's a GTK utility, in contrast to the rest of LXQt;
and looks like it's not that needed anymore with
better native display setup (if anyone does prefer
arandr in this particular image, drop me a note).
2015-11-03 18:13:14 +03:00
Michael Shigorin
fd1044d540 regular.mk: move lxqt to sddm
lxqt-lightdm-greeter is finally *really* deprecated,
LXQt's build system has changed enough to warrant its
FTBFS without the same changes.

Note that this won't cut it for p7 starterkits anymore.
2015-11-03 18:13:12 +03:00
Michael Shigorin
8fc08068f3 x11-autologin: updated sddm case
Looks like "LXQt" session type is broken for
sddm 0.12.0 with lxqt 0.10.0 while "lxqt" one
is fine; so be it.
2015-11-03 18:13:11 +03:00
Michael Shigorin
fb1781a4c9 regular.mk: added wmxkbru to wmaker
This one has been suggested by YYY:
https://forum.altlinux.org/index.php?topic=35623.msg268496#msg268496
2015-11-03 18:13:09 +03:00
Michael Shigorin
8b35dcc48a regular.mk: e19 -> enlightenment
The packages have been renamed quite some time ago indeed,
and dancing image URLs don't help a lot.
2015-10-29 16:56:47 +03:00
Michael Shigorin
708cc4fc4b x11: e19 -> enlightenment
The packages have been renamed quite some time ago,
no need to introduce artificial multifurcation.
2015-10-29 16:53:21 +03:00
Michael Shigorin
35dd7ece35 regular.mk: added flashback session to gnome3
This one adds a "classic" GNOME2-like session;
one needs to select it by hand though, and gdm
won't bother them with a selector "gear" widget
unless there's a password set for the user.

Thus no autologin without explicit session
specification seems possible so far.

Note that there's no way to have gdm without
gnome-shell currently.
2015-10-29 16:15:00 +03:00
Michael Shigorin
4534ca313b init: improve systemd debug facilities
The "best" "feature" of systemd "init system" has just
emerged once again: it will happily sit there idling
given startup or shutdown loops resulting in what looks
like a hang to an unsuspecting user; let's provide the
suspecting one with at least some tools described at
http://www.freedesktop.org/wiki/Software/systemd/Debugging
2015-10-20 14:18:18 +03:00
Michael Shigorin
80448ae1bf gear-store-tags 2015-10-19 23:43:39 +03:00
Michael Shigorin
dd8cbc4982 1.1.77-alt1
- webkiosk improvements
2015-10-19 23:43:16 +03:00
Michael Shigorin
206491d078 x11-autologin: nopasswdlogin group for sddm too
See also this somewhat related conversation (in Russian):
https://forum.altlinux.org/index.php?topic=28619.345
2015-10-14 18:50:01 +03:00
Michael Shigorin
b31006e20c live.mk: reduce webkiosk boot noise
Let's try to denoise kiosks a bit (this has been
tested on a project-specific image first)...
2015-10-14 17:29:42 +03:00
Michael Shigorin
37d178800e live.mk: use more of the browser feature
use/browser/firefox/esr was not enough to actually select firefox-esr
as the FX_FLAVOUR handler was simply not getting included (see also
the preceding commit); specify it explicitly.

The future mod might be introducing some "live" flag for that feature
to use it instead of adding livecd-webkiosk-* packages by hand...
2015-10-14 17:21:36 +03:00
Michael Shigorin
4a503294a3 browser: tweak target dependencies
The issue with this was that plain use/browser/firefox/esr
didn't actually pull in the feature as such; it MUST NOT
pull in use/browser/firefox since it will change semantics
from "if it's Firefox make it ESR" to outright "use FX ESR"
(starterkits depend on the former and it was intentional).
2015-10-14 17:04:49 +03:00
Michael Shigorin
ef9b20cd29 rescue+extra: added htop
...so it hits regular-rescue.iso...
2015-10-14 12:59:25 +03:00
Michael Shigorin
3f7d935159 gear-store-tags 2015-10-12 18:47:23 +03:00
Michael Shigorin
33f4fc79ff 1.1.76-alt1
- no more GREP_OPTIONS
2015-10-12 18:43:46 +03:00
Michael Shigorin
5c49535c59 build.mk: get rid of GREP_OPTIONS
It was superfluous in the first place indeed,
and new grep(1) considers the option deprecated.
2015-10-09 16:40:02 +03:00
Michael Shigorin
e37f5e1307 gear-store-tags 2015-09-28 19:34:16 +03:00
Michael Shigorin
1d77e3778b 1.1.75-alt1
- systemd-specific hook for installer (solo@)
2015-09-28 19:32:57 +03:00
Michael Shigorin
1f107fcbd3 regular.mk: font tweaks for test images
Both kde5 and xfce-sysv have received their fair share
of criticism for substandard fonts; zerg@ has proposed
adding droid fonts to the former and someone expressed
their frustration with Terminal fonts in the latter:
http://www.opennet.ru/openforum/vsluhforumID3/104750.html#70

Let's try to make some difference between Xfce based
flavours as well by changing the kernel to a bit more
"bleeding" one as proposed either.
2015-09-24 22:04:32 +03:00
Michael Shigorin
42905a7b5a live.mk, regular.mk: move plymouth to test mediacheck
It was observed in regular-gnustep-20150916-*.iso that
mediacheck boot target sort of starts plymouth bootsplash
when not intended to; let's plug this by moving +plymouth
away to a test image *but* there are couple things with it:

1) supporting plymouth in mediacheck *might* be a good thing
   for distros proper -- this will likely require some support
   on bootsplash theme side either;
2) it's not enough to just drop @bootargs@ from syslinux.cfg
   snippet as the extra payload will still go in to no avail.
2015-09-24 22:04:29 +03:00
Michael Shigorin
bf232c04bf x11-autologin: updated KDE5 session name
s/PLASMA/Plasma/ (thanks zerg@)
2015-09-24 22:04:24 +03:00
Aleksey Avdeev
47f8d6ef1c services: Add systemd-specific hooks
Signed-off-by: Aleksey Avdeev <avdeev@pkcc-tb.ru>
2015-09-24 20:41:39 +03:00
Michael Shigorin
17d9f63a58 gear-store-tags 2015-09-14 21:01:18 +03:00
Michael Shigorin
d5fb22a7f8 1.1.74-alt1
- starterkits-20150912
2015-09-14 21:00:16 +03:00
Michael Shigorin
d2de19e1f3 live.mk, p7.mk: prefer ESR if it's firefox
Both starterkits and live webkiosk images carrying Firefox
are switched to ESR packages by this commit; note that those
images with other browsers aren't affected.
2015-09-08 20:18:29 +03:00
Michael Shigorin
5af8b76db8 browser: introduce firefox-esr support
FX_FLAVOUR variable can be set anywhere to switch
use/browser/firefox to prefer ESR packages, including
the appropriate localization ones.

Note that there's no dependency as it can be set in e.g.
starterkits (still unset in regular builds) wholesale
but shouldn't affect those of them lacking firefox.
2015-09-08 20:11:45 +03:00
Michael Shigorin
8dd2c5d00d im: drop dependency upon l10n
This was wrong as l10n with no LOCALE would result
in "lang=" being added to the boot menu and not
overridden by F2 selection.
2015-09-08 18:07:20 +03:00
Michael Shigorin
dcd8a865e7 desktop+regular, rescue+extra: added ldd-requires
This one has been proposed by antohami@ so as to ease support:
http://forum.altlinux.org/index.php?topic=35274.msg263698#msg263698
2015-09-08 14:54:09 +03:00
Michael Shigorin
b7b3d7b07f desktop+lxde+extra: added notify-osd
This one has been suggested by shadowsbrother@ and restored
in Sisyphus as a lightweight notifyd provider.
2015-09-08 14:52:41 +03:00
Michael Shigorin
29ad239354 regular.mk: added smartcard support
This has been an old TODO item either.
2015-09-08 14:29:07 +03:00
Michael Shigorin
7258e7508a live.mk: added efi/isohybrid to webkiosk images
This has apparently been a TODO item stuck until finding out
whether efi and isohybrid conflict or not; it's been a *long*
time since this has been found out (no conflict) actually,
let's add isohybrid to all of the images as it's completely
free size-wise and efi to chromium image as it's the largest
base one (I don't think that adding any extra functionality
to the already overweight and full of potential and kinetic
security bugs "flash" flavour is a good idea as it would
promote its use among those who need EFI but not Flash).
2015-09-08 11:50:27 +03:00
Michael Shigorin
bcf4c4a265 gear-store-tags 2015-09-07 23:29:08 +03:00
26 changed files with 110 additions and 51 deletions

View File

@@ -1,5 +1,5 @@
Name: mkimage-profiles
Version: 1.1.73
Version: 1.1.78
Release: alt1
Summary: ALT Linux based distribution metaprofile
@@ -79,6 +79,21 @@ cp -a * %buildroot%mpdir
%doc %docs/*
%changelog
* Mon Nov 09 2015 Michael Shigorin <mike@altlinux.org> 1.1.78-alt1
- regular-enlightenment
* Mon Oct 19 2015 Michael Shigorin <mike@altlinux.org> 1.1.77-alt1
- webkiosk improvements
* Mon Oct 12 2015 Michael Shigorin <mike@altlinux.org> 1.1.76-alt1
- no more GREP_OPTIONS
* Mon Sep 28 2015 Michael Shigorin <mike@altlinux.org> 1.1.75-alt1
- systemd-specific hook for installer (solo@)
* Mon Sep 14 2015 Michael Shigorin <mike@altlinux.org> 1.1.74-alt1
- starterkits-20150912
* Mon Sep 07 2015 Michael Shigorin <mike@altlinux.org> 1.1.73-alt1
- im feature

View File

@@ -1,6 +0,0 @@
object df7a24a965f05dc12f8b507c2976f98c54274a20
type commit
tag v1.1.72
tagger Michael Shigorin <mike@altlinux.org> 1441044805 +0300
starterkits alpha

View File

@@ -0,0 +1,6 @@
object dd8cbc498242d770463807c5df4c9bd127fa8c72
type commit
tag v1.1.77
tagger Michael Shigorin <mike@altlinux.org> 1445287411 +0300
webkiosks

View File

@@ -1 +1 @@
b1e30066e6355488fc06174459beb88562d0aced v1.1.72
e59af1ad7e7cda5c010ec3a66caff5feab15b6a3 v1.1.77

View File

@@ -25,7 +25,9 @@ distro/.live-kiosk: distro/.base use/live/base use/live/autologin \
use/syslinux/timeout/1 use/cleanup use/stage2/net-eth \
use/fonts/otf/adobe +power
@$(call add,CLEANUP_PACKAGES,'alterator*' 'guile*' 'vim-common')
@$(call set,SYSLINUX_UI,none)
@$(call set,SYSLINUX_CFG,live)
@$(call add,STAGE2_BOOTARGS,quiet)
@$(call add,DEFAULT_SERVICES_DISABLE,rpcbind klogd syslogd)
@$(call add,DEFAULT_SERVICES_DISABLE,consolesaver fbsetfont keytable)
@@ -49,24 +51,25 @@ distro/live-rescue: distro/live-icewm +efi
$(call tags,(base || extra) && (archive || rescue || network)))
# NB: this one doesn't include the browser, needs to be chosen downstream
distro/.live-webkiosk: distro/.live-kiosk use/live/hooks use/live/ru use/sound
distro/.live-webkiosk: distro/.live-kiosk \
use/isohybrid use/live/hooks use/live/ru use/sound
@$(call add,LIVE_LISTS,$(call tags,live desktop))
distro/.live-webkiosk-gtk: distro/.live-webkiosk
@$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*')
# kiosk users rather prefer stability to latest bling
distro/live-webkiosk-mini: distro/.live-webkiosk-gtk \
use/fonts/otf/mozilla use/isohybrid
use/browser/firefox use/browser/firefox/esr use/fonts/otf/mozilla
@$(call add,LIVE_PACKAGES,livecd-webkiosk-firefox)
# NB: flash/java plugins are predictable security holes
distro/live-webkiosk-flash: distro/live-webkiosk-mini use/plymouth/live \
use/browser/plugin/flash use/browser/plugin/java use/efi/signed \
+vmguest; @:
use/browser/plugin/flash use/browser/plugin/java +vmguest; @:
distro/live-webkiosk: distro/live-webkiosk-mini use/live/desktop; @:
distro/live-webkiosk-chromium: distro/.live-webkiosk use/fonts/ttf/google
distro/live-webkiosk-chromium: distro/.live-webkiosk use/fonts/ttf/google +efi
@$(call add,LIVE_PACKAGES,livecd-webkiosk-chromium)
distro/live-webkiosk-seamonkey: distro/.live-webkiosk use/fonts/ttf/google

View File

@@ -1,6 +1,6 @@
# p7 base kits
mixin/p7:
mixin/p7: use/browser/firefox/esr
@$(call set,BRANDING,altlinux-starterkit)
ifeq (distro,$(IMAGE_CLASS))

View File

@@ -16,7 +16,7 @@ distro/.regular-x11: distro/.regular-base +vmguest +wireless \
@$(call add,LIVE_LISTS,$(call tags,(base || desktop) && regular))
@$(call add,LIVE_LISTS,$(call tags,base rescue))
@$(call add,LIVE_PACKAGES,gpm livecd-install-apt-cache)
@$(call add,DEFAULT_SERVICES_ENABLE,gpm)
@$(call add,DEFAULT_SERVICES_ENABLE,gpm ntpd)
@$(call add,EFI_BOOTARGS,live_rw)
# common WM live/installer bits
@@ -101,11 +101,11 @@ mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \
# wdm can't do autologin so add standalone one for livecd
distro/regular-wmaker: distro/.regular-sysv \
mixin/regular-wmaker use/live/autologin use/browser/seamonkey/i18n
@$(call add,LIVE_PACKAGES,wdm)
@$(call add,LIVE_PACKAGES,wdm wmxkbru)
# gdm2.20 can reboot/halt with both sysvinit and systemd, and is slim
mixin/regular-gnustep: use/x11/gnustep use/x11/gdm2.20 use/mediacheck \
use/browser/firefox/classic +plymouth
use/browser/firefox/classic
@$(call add,THE_BRANDING,graphics)
distro/regular-gnustep: distro/.regular-sysv \
@@ -117,8 +117,10 @@ distro/regular-xfce: distro/.regular-gtk \
use/x11/xfce use/domain-client/full use/browser/firefox/classic \
use/fonts/ttf/redhat use/x11/gtk/nm +nm; @:
distro/regular-xfce-sysv: distro/.regular-sysv-gtk use/init/sysv/polkit \
use/x11/xfce use/fonts/ttf/redhat
distro/regular-xfce-sysv: distro/.regular-sysv-gtk \
use/init/sysv/polkit use/x11/xfce \
use/fonts/ttf/redhat use/fonts/otf/adobe use/fonts/otf/mozilla
@$(call set,KFLAVOURS,un-def)
@$(call add,LIVE_PACKAGES,xfce4-mixer pm-utils bc elinks mpg123)
distro/regular-lxde: distro/.regular-gtk use/x11/lxde use/fonts/infinality \
@@ -134,8 +136,12 @@ distro/regular-mate: distro/.regular-gtk +nm \
@$(call add,LIVE_LISTS,$(call tags,desktop sane))
distro/regular-e17: distro/.regular-gtk use/x11/e17 use/fonts/infinality; @:
distro/regular-e19: distro/.regular-gtk use/x11/e19 use/fonts/infinality; @:
distro/regular-e19-sysv: distro/.regular-sysv-gtk use/x11/e19; @:
distro/regular-enlightenment: distro/.regular-gtk \
use/x11/enlightenment use/fonts/infinality; @:
distro/regular-enlightenment-sysv: distro/.regular-sysv-gtk \
use/x11/enlightenment; @:
distro/regular-cinnamon: distro/.regular-gtk \
use/x11/cinnamon use/fonts/infinality use/net/nm/mmgui use/im
@@ -147,6 +153,7 @@ distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \
use/x11/gnome3 use/browser/epiphany use/fonts/ttf/redhat
@$(call add,LIVE_PACKAGES_REGEXP,^setup-gnome3-done.*)
@$(call add,LIVE_PACKAGES,gnome3-regular xcalib templates)
@$(call add,LIVE_PACKAGES,gnome-flashback)
# reusable bits
mixin/regular-tde: +tde \
@@ -168,7 +175,7 @@ distro/regular-kde4: distro/.regular-desktop use/x11/kde4/nm use/x11/kdm4 \
@$(call add,THE_PACKAGES,volumes-profile-lite gparted)
@$(call add,DEFAULT_SERVICES_ENABLE,prefdm)
mixin/regular-lxqt: use/x11/lxqt use/x11/lightdm/lxqt \
mixin/regular-lxqt: use/x11/lxqt use/x11/sddm \
use/net/connman use/browser/qupzilla +plymouth
@$(call add,THE_PACKAGES,qconnman-ui)
@@ -183,7 +190,9 @@ distro/regular-leechcraft: distro/.regular-desktop \
use/x11/leechcraft use/x11/lightdm/lxqt +pulse; @:
distro/regular-kde5: distro/.regular-desktop \
use/x11/kde5 use/x11/sddm use/fonts/zerg +nm +pulse +plymouth
use/x11/kde5 use/x11/sddm \
use/fonts/ttf/google use/fonts/ttf/redhat use/fonts/zerg \
+nm +pulse +plymouth
@$(call add,THE_PACKAGES,kde5-telepathy)
# NB: never ever use/syslinux/ui/gfxboot here as gfxboot mangles
@@ -198,6 +207,7 @@ distro/regular-rescue: distro/.regular-base use/rescue/rw use/luks \
use/mediacheck test/rescue/no-x11 +wireless +sysvinit
@$(call set,KFLAVOURS,un-def)
@$(call add,RESCUE_PACKAGES,gpm livecd-net-eth)
@$(call add,RESCUE_LISTS,$(call tags,base smartcard))
distro/regular-sysv-tde: distro/.regular-install-x11 \
mixin/desktop-installer mixin/regular-tde use/install2/fs \
@@ -246,8 +256,8 @@ distro/regular-builder: distro/.regular-bare \
@$(call add,DEFAULT_SERVICES_ENABLE,gpm)
distro/regular-server-samba4: distro/regular-server
@$(call add,THE_LISTS,$(call tags,server && (sambaAD || alterator)))
@$(call add,THE_PACKAGES,alterator-fbi alterator-dhcp bind-utils)
@$(call add,THE_LISTS,$(call tags,server && (sambaDC || alterator)))
@$(call add,THE_PACKAGES,alterator-fbi alterator-dhcp)
@$(call add,DEFAULT_SERVICES_DISABLE,smbd nmbd)
endif

View File

@@ -8,7 +8,7 @@ distro/syslinux-noescape: distro/syslinux-auto use/syslinux/noescape.cfg; @:
distro/live-systemd: distro/.base use/live/base +systemd; @:
distro/live-plymouth: distro/.live-base use/plymouth/live; @:
distro/live-mediacheck: distro/.base use/mediacheck; @:
distro/live-mediacheck: distro/.base use/mediacheck +plymouth; @:
distro/live-testserver: distro/live-install use/server/mini
@$(call set,KFLAVOURS,std-def el-smp)

View File

@@ -3,7 +3,11 @@ use/browser:
@$(call add,THE_PACKAGES_REGEXP,$$(THE_BROWSER))
@$(call try,THE_BROWSER,webclient) # fallback
use/browser/firefox use/browser/seamonkey \
# support both firefox and firefox-esr
use/browser/firefox: use/browser
@$(call set,THE_BROWSER,firefox$$(FX_FLAVOUR))
use/browser/seamonkey \
use/browser/chromium use/browser/epiphany \
use/browser/qupzilla use/browser/rekonq \
use/browser/elinks use/browser/links2: \
@@ -16,12 +20,19 @@ use/browser/konqueror: use/browser
use/browser/konqueror4: use/browser
@$(call set,THE_BROWSER,kde4base-konqueror)
# the complete lack of dependencies is intentional
use/browser/firefox/esr: use/browser
@$(call set,FX_FLAVOUR,-esr)
use/browser/firefox/live: use/browser/firefox
@$(call add,THE_BROWSER,livecd-firefox)
# scarey, and will have to be done otherwise when l10n feature is there
use/browser/firefox/i18n: use/browser/firefox
@$(call add,THE_BROWSER,firefox-be firefox-kk firefox-ru firefox-uk)
@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-be)
@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-kk)
@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-ru)
@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-uk)
# fx29+
use/browser/firefox/classic: use/browser/firefox

View File

@@ -1,6 +1,6 @@
# Input Method configuration through IBus
use/im: use/l10n
use/im:
@$(call add_feature)
@$(call add,THE_PACKAGES,$$(IM_PACKAGES))
@$(call add,THE_LISTS,$(call tags,desktop ibus))

View File

@@ -22,5 +22,10 @@ use/init/systemd: use/init
@$(call set,INIT_TYPE,systemd)
@$(call add,INSTALL2_PACKAGES,installer-feature-journald-tty)
# http://www.freedesktop.org/wiki/Software/systemd/Debugging
use/init/systemd/debug: use/init/systemd use/services
@$(call add,THE_PACKAGES,systemd-shutdown-debug-script)
@$(call add,SERVICES_ENABLE,debug-shell)
@$(call add,STAGE2_BOOTARGS,systemd.log_level=debug)
@$(call add,STAGE2_BOOTARGS,systemd.log_target=kmsg)
@$(call add,STAGE2_BOOTARGS,log_buf_len=1M enforcing=0)

View File

@@ -29,11 +29,21 @@ SERVICES="$GLOBAL_DEFAULT_SERVICES_ENABLE $GLOBAL_DEFAULT_SERVICES_DISABLE"
SERVICES="$SERVICES $GLOBAL_SERVICES_ENABLE $GLOBAL_SERVICES_DISABLE"
SERVICES="$(echo $SERVICES | sort -u)"
# TODO: provide systemd-specific hooks too?
for i in $SERVICES; do
onoff="$(shell_config_get "$STATUS" "$i")"
[ -n "$onoff" ] || continue
echo "$i" >> /usr/share/install2/services-"$onoff"
# create systemd-specific hooks
case "$onoff" in
on)
action=enabled;;
off)
action=disabled;;
*)
continue;;
esac
echo "$i" >> /usr/share/install2/systemd-"$action"
done
rm "$STATUS"

View File

@@ -109,16 +109,19 @@ SDDM_RC=/etc/X11/sddm/sddm.conf
SDDM_SESSION=
if [ -f "$SDDM_RC" ]; then
backup "$SDDM_RC"
backup "/etc/group"
add_nopasswdlogin_group sddm ||:
sed -i "s,^User=$,&$USER," "$SDDM_RC"
if [ -f /usr/share/xsessions/lxqt.desktop ]; then
SDDM_SESSION=LXQt
SDDM_SESSION=lxqt
elif [ -f /usr/share/xsessions/plasma.desktop ]; then
SDDM_SESSION=PLASMA
SDDM_SESSION=plasma
fi
if [ -n "$SDDM_SESSION" ]; then
sed -i "s,^Session=$,&$SDDM_SESSION," "$SDDM_RC"
fi
restore_later "$SDDM_RC"
restore_later "/etc/group"
fi
## nodm autologin (the last since the most intrusive)

View File

@@ -108,8 +108,8 @@ use/x11/gnome3: use/x11/xorg +pulse
use/x11/e17: use/x11 use/net/connman
@$(call add,THE_LISTS,$(call tags,e17 desktop))
use/x11/e19: use/x11 use/net/connman
@$(call add,THE_LISTS,$(call tags,e19 desktop))
use/x11/enlightenment: use/x11 use/net/connman
@$(call add,THE_LISTS,$(call tags,enlightenment desktop))
@$(call add,DEFAULT_SERVICES_DISABLE,acpid)
use/x11/lxde: use/x11

View File

@@ -66,8 +66,8 @@ build-image: profile/populate
tail -n $(MAX_LINES) "$(BUILDLOG)" $(SHORTEN) \
| if [ -z "$(QUIET)" ]; then \
echo "$(TIME) done $$DURATION"; \
GREP_COLOR="$(ANSI_OK)" GREP_OPTIONS="--color=auto" \
grep '^\*\* image: .*$$' ||:; \
GREP_COLOR="$(ANSI_OK)" \
grep --color=auto '^\*\* image: .*$$' ||:; \
else \
echo -n "$(TIME) $$DURATION "; \
sed -rn 's/^\*\* image: (.*)$$/\1/p'; \
@@ -85,8 +85,8 @@ build-image: profile/populate
echo "$(TIME) (you might want to rerun with DEBUG=1)"; \
fi; \
tail -n $(MAX_LINES) "$(BUILDLOG)" \
| GREP_COLOR="$(ANSI_FAIL)" GREP_OPTIONS="--color=auto" \
egrep -m "$(MAX_ERRORS)" "$(GOTCHA)"; \
| GREP_COLOR="$(ANSI_FAIL)" \
egrep --color=auto -m "$(MAX_ERRORS)" "$(GOTCHA)"; \
df -P $(BUILDDIR) | awk 'END { if ($$4 < $(LOWSPACE)) \
{ print "NB: low space on "$$6" ("$$5" used)"}}'; \
fi; \

View File

@@ -3,3 +3,4 @@ sysklogd
interactivesystem
systemd-
systemd-services-

View File

@@ -9,3 +9,4 @@ pcsc-lite-openct
pcsc-lite-rutokens
pam_pkcs11
pam_p11

View File

@@ -21,3 +21,6 @@ obconf
# an asus eeepc inspired application launcher (needs integration)
lxde-lxlauncher
# instead of a (missing) native notification display
notify-osd

View File

@@ -26,7 +26,7 @@ clementine-codecs-full
# upstream recommended
#ptbatterysystemtray
arandr
#arandr
qbittorrent
quiterss

View File

@@ -21,7 +21,8 @@ alterator-proxy
#alterator-x11
alterator-xkb
#alterator-datetime
alterator-datetime
openntpd
glxgears
xorg-conf-synaptics
@@ -33,3 +34,5 @@ smartmontools
fonts-bitmap-terminus
fonts-ttf-levien-inconsolata
ldd-requires

View File

@@ -3,7 +3,6 @@ alterator-x11
htop
k3b
openntpd
pm-utils
asoundconf

View File

@@ -50,6 +50,7 @@ whdd
binutils
dmidecode
gnupg
htop
pciutils
procps
quota
@@ -71,6 +72,7 @@ agrep-tre
enca
findutils
file
ldd-requires
less
lnav
wdiff

View File

@@ -1,10 +0,0 @@
samba-DC
samba-DC-client
samba-DC-common
samba-DC-winbind
samba-DC-winbind-clients
python-module-samba-DC
bind-utils
krb5-kinit
tdb-utils

View File

@@ -0,0 +1,3 @@
task-samba-dc
bind-utils
tdb-utils