forked from altcloud/mkimage-profiles
Compare commits
33 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
867b2f65c9 | ||
|
13094e7901 | ||
|
18e6406588 | ||
|
f7a97306fb | ||
|
92ff4c1cc8 | ||
|
ba2ca7e578 | ||
|
971732bfe6 | ||
|
acf17cd785 | ||
|
6fa08c52e7 | ||
|
8645219667 | ||
|
a89fff3c6a | ||
|
8fc64a023f | ||
|
5fd2be3edd | ||
|
cbf8426add | ||
|
e5fdaacc94 | ||
|
91466e6643 | ||
|
375e1afe34 | ||
|
eb569544ca | ||
|
77f1459f52 | ||
|
28f7f9be27 | ||
|
cec6b26207 | ||
|
96bdf36935 | ||
|
c12f0c17bc | ||
|
5834dac8c8 | ||
|
6a554e21ab | ||
|
313b279d40 | ||
|
ad264c7033 | ||
|
ec8bcac5ff | ||
|
3161ec500b | ||
|
458d72b8c3 | ||
|
d83eb78762 | ||
|
61ead13d3a | ||
|
d9ae996571 |
@@ -1,5 +1,5 @@
|
||||
Name: mkimage-profiles
|
||||
Version: 0.9.6
|
||||
Version: 0.9.8
|
||||
Release: alt1
|
||||
|
||||
Summary: ALT Linux based distribution metaprofile
|
||||
@@ -78,6 +78,12 @@ cp -a * %buildroot%mpdir
|
||||
%doc %docs/*
|
||||
|
||||
%changelog
|
||||
* Mon Feb 18 2013 Michael Shigorin <mike@altlinux.org> 0.9.8-alt1
|
||||
- live fixes/tweaks galore
|
||||
|
||||
* Mon Feb 11 2013 Michael Shigorin <mike@altlinux.org> 0.9.7-alt1
|
||||
- going nightly
|
||||
|
||||
* Mon Feb 04 2013 Michael Shigorin <mike@altlinux.org> 0.9.6-alt1
|
||||
- assorted fixes
|
||||
|
||||
|
@@ -1,6 +0,0 @@
|
||||
object b74ad4d592498d38a81757d4534afecd9b18a8bf
|
||||
type commit
|
||||
tag v0.9.5
|
||||
tagger Michael Shigorin <mike@altlinux.org> 1358785513 +0200
|
||||
|
||||
homeros
|
6
.gear/tags/fcadfe94c9b21f15c0df26817b8f8fd04134a61e
Normal file
6
.gear/tags/fcadfe94c9b21f15c0df26817b8f8fd04134a61e
Normal file
@@ -0,0 +1,6 @@
|
||||
object eb569544ca7b9fa44358fe8f1fff109d684ca3a6
|
||||
type commit
|
||||
tag v0.9.7
|
||||
tagger Michael Shigorin <mike@altlinux.org> 1360605773 +0400
|
||||
|
||||
going nightly
|
@@ -1 +1 @@
|
||||
486bf7868d0df7b513fbfe0b048b84d15b177297 v0.9.5
|
||||
fcadfe94c9b21f15c0df26817b8f8fd04134a61e v0.9.7
|
||||
|
@@ -3,13 +3,19 @@
|
||||
|
||||
. shell-error
|
||||
|
||||
INIT=
|
||||
if [ "$1" = "-i" ]; then
|
||||
INIT=yes
|
||||
shift
|
||||
fi
|
||||
|
||||
[ -d "$1" ] || fatal "$1 is not an existing directory"
|
||||
|
||||
if type -t git >&/dev/null && pushd "$1" >/dev/null; then
|
||||
if [ -z "$(git config --global user.name)" ]; then
|
||||
exit 0
|
||||
fi
|
||||
if [ ! -d .git ]; then
|
||||
if [ -n "$INIT" -a ! -d .git ]; then
|
||||
git init -q || fatal "git init failed"
|
||||
fi
|
||||
if [ -n "$(git status -s)" ]; then
|
||||
|
@@ -7,11 +7,12 @@ distro/syslinux: distro/.init \
|
||||
use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @:
|
||||
|
||||
distro/.live-base: distro/.base use/live/base use/power/acpi/button; @:
|
||||
distro/.live-desktop: distro/.base +live use/plymouth/live; @:
|
||||
distro/.live-desktop: distro/.base +live use/live/install use/live/net-eth \
|
||||
use/plymouth/live use/efi; @:
|
||||
distro/.live-desktop-ru: distro/.live-desktop use/live/ru; @:
|
||||
|
||||
distro/.live-kiosk: distro/.base use/live/base use/live/autologin \
|
||||
use/syslinux/timeout/1 use/cleanup +power
|
||||
distro/.live-kiosk: distro/.base use/live/base use/live/autologin +power \
|
||||
use/syslinux/timeout/1 use/cleanup use/efi/signed use/live/net-eth
|
||||
@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu)
|
||||
@$(call add,CLEANUP_PACKAGES,'alterator*' 'guile*' 'vim-common')
|
||||
|
||||
@@ -31,9 +32,10 @@ distro/live-builder: distro/live-builder-mini use/dev/repo
|
||||
distro/live-install: distro/.live-base use/live/textinstall; @:
|
||||
distro/.livecd-install: distro/.live-base use/live/install; @:
|
||||
|
||||
distro/live-icewm: distro/.live-desktop use/live/autologin +icewm; @:
|
||||
distro/live-razorqt: distro/.live-desktop use/live/autologin +razorqt; @:
|
||||
distro/live-icewm: distro/.live-desktop use/x11/lightdm/gtk +icewm; @:
|
||||
distro/live-razorqt: distro/.live-desktop +razorqt; @:
|
||||
distro/live-tde: distro/.live-desktop-ru use/live/install +tde; @:
|
||||
distro/live-fvwm: distro/.live-desktop-ru use/x11/lightdm/gtk use/x11/fvwm; @:
|
||||
|
||||
distro/live-rescue: distro/live-icewm use/efi
|
||||
@$(call add,LIVE_LISTS,$(call tags,rescue && (fs || live || x11)))
|
||||
@@ -42,9 +44,9 @@ distro/live-rescue: distro/live-icewm use/efi
|
||||
|
||||
distro/live-webkiosk-mini: distro/.live-kiosk use/live/hooks use/live/ru
|
||||
@$(call add,LIVE_LISTS,$(call tags,desktop && (live || network)))
|
||||
@$(call add,LIVE_PACKAGES,livecd-webkiosk)
|
||||
@$(call add,LIVE_PACKAGES,livecd-webkiosk-firefox)
|
||||
@$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*')
|
||||
@$(call set,KFLAVOURS,led-ws)
|
||||
@#$(call set,KFLAVOURS,led-ws)
|
||||
|
||||
# NB: flash/java plugins are predictable security holes
|
||||
distro/live-webkiosk-flash: distro/live-webkiosk-mini use/plymouth/live +vmguest
|
||||
|
@@ -3,16 +3,19 @@ ifeq (distro,$(IMAGE_CLASS))
|
||||
|
||||
# TODO: use/plymouth/live when luks+plymouth is done, see also #28255
|
||||
distro/.regular-desktop: distro/.base +live +wireless use/live/ru \
|
||||
use/live/install use/live/repo use/x11/3d-free use/systemd \
|
||||
use/firmware/wireless use/efi/signed use/luks +plymouth \
|
||||
use/live/install use/live/repo use/live/net-eth use/x11/3d-free \
|
||||
use/systemd use/firmware/wireless use/efi/signed use/luks \
|
||||
+vmguest use/memtest use/branding use/syslinux/ui/gfxboot
|
||||
@$(call add,LIVE_LISTS,$(call tags,base regular))
|
||||
@$(call add,LIVE_LISTS,$(call tags,rescue extra))
|
||||
@$(call add,LIVE_LISTS,domain-client)
|
||||
@$(call add,THE_BRANDING,indexhtml notes alterator bootloader)
|
||||
@$(call set,KFLAVOURS,std-def)
|
||||
@$(call add,KMODULES,r8168)
|
||||
@$(call try,SAVE_PROFILE,yes)
|
||||
|
||||
distro/.regular-gtk: distro/.regular-desktop use/x11/gdm2.20; @:
|
||||
distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
|
||||
@$(call add,THE_BRANDING,graphics)
|
||||
|
||||
distro/regular-icewm: distro/.regular-gtk +icewm use/efi/refind
|
||||
@$(call add,LIVE_PACKAGES,xxkb mutt)
|
||||
@@ -22,24 +25,25 @@ distro/regular-lxde: distro/.regular-gtk use/x11/lxde; @:
|
||||
|
||||
distro/regular-mate: distro/.regular-gtk
|
||||
@$(call add,LIVE_LISTS,$(call tags,(desktop || mobile) && (mate || nm)))
|
||||
@$(call add,THE_BRANDING,graphics)
|
||||
|
||||
distro/regular-e17: distro/.regular-gtk use/x11/e17
|
||||
@$(call add,LIVE_PACKAGES,xterm xorg-xnest)
|
||||
|
||||
distro/regular-cinnamon: distro/.regular-desktop use/x11/cinnamon
|
||||
@$(call set,META_VOL_ID,ALT Linux $(IMAGE_NAME)) # see also #28271
|
||||
@$(call add,LIVE_PACKAGES,fontconfig-infinality)
|
||||
|
||||
distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3; @:
|
||||
|
||||
distro/regular-tde: distro/.regular-desktop +tde
|
||||
distro/regular-tde: distro/.regular-desktop +tde +plymouth
|
||||
@$(call add,LIVE_LISTS,$(call tags,desktop nm))
|
||||
@$(call add,LIVE_PACKAGES,kdegames kdeedu)
|
||||
|
||||
distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4
|
||||
distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4 +plymouth
|
||||
@$(call add,LIVE_PACKAGES,kde4-regular)
|
||||
@$(call add,LIVE_PACKAGES,plasma-applet-networkmanager)
|
||||
|
||||
distro/regular-razorqt: distro/.regular-desktop use/x11/razorqt use/x11/kdm4; @:
|
||||
distro/regular-razorqt: distro/.regular-desktop use/x11/razorqt use/x11/kdm4 \
|
||||
+plymouth; @:
|
||||
|
||||
endif
|
||||
|
@@ -11,7 +11,7 @@ distro/server-nano: distro/.server-base \
|
||||
|
||||
distro/server-mini: distro/.server-base use/server/mini \
|
||||
use/cleanup/x11-alterator use/efi
|
||||
@$(call set,KFLAVOURS,led-ws)
|
||||
@$(call add,BASE_PACKAGES,make-initrd-mdadm make-initrd-lvm)
|
||||
|
||||
distro/server-ovz: distro/server-mini use/install2/net use/hdt use/rescue \
|
||||
use/firmware/server use/firmware/wireless use/power/acpi/button
|
||||
|
@@ -1,3 +1,5 @@
|
||||
+efi: use/efi; @:
|
||||
|
||||
ifeq (x86_64,$(ARCH))
|
||||
|
||||
EFI_LISTS := $(call tags,base efi)
|
||||
@@ -9,7 +11,7 @@ use/efi:
|
||||
@$(call add,RESCUE_LISTS,$(EFI_LISTS))
|
||||
@$(call add,THE_PACKAGES,$$(EFI_SHELL))
|
||||
@$(call add,RESCUE_PACKAGES,refind $$(EFI_SHELL))
|
||||
@$(call add,INSTALL2_PACKAGES,dosfstools)
|
||||
@$(call add,INSTALL2_PACKAGES,dosfstools fatresize)
|
||||
@$(call try,EFI_BOOTLOADER,elilo) # default one
|
||||
|
||||
use/efi/refind: use/efi
|
||||
|
@@ -14,7 +14,8 @@ use/live/x11: use/live use/firmware use/x11/xorg
|
||||
@$(call add,LIVE_PACKAGES,xinit)
|
||||
|
||||
# optimized out: use/x11/xorg
|
||||
use/live/desktop: use/live/base use/x11/wacom use/live/sound +vmguest +power
|
||||
use/live/desktop: use/live/base use/x11/wacom use/live/sound \
|
||||
+vmguest +power +efi
|
||||
@$(call add,LIVE_LISTS,$(call tags,desktop && (live || network)))
|
||||
@$(call add,LIVE_LISTS,$(call tags,base l10n))
|
||||
@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu fonts-ttf-droid)
|
||||
@@ -52,3 +53,8 @@ use/live/ru: use/live
|
||||
|
||||
use/live/sound: use/live
|
||||
@$(call add,LIVE_PACKAGES,amixer alsa-utils aplay udev-alsa)
|
||||
|
||||
# eth0 instead of enp0s3
|
||||
use/live/net-eth: use/live
|
||||
@$(call add,STAGE1_PACKAGES,udev-rule-generator-net)
|
||||
@$(call add,STAGE2_PACKAGES,udev-rule-generator-net livecd-net-eth)
|
||||
|
@@ -33,6 +33,7 @@ livecd-hostname
|
||||
livecd-save-nfs
|
||||
livecd-setauth
|
||||
livecd-setlocale
|
||||
livecd-net-eth
|
||||
network
|
||||
NetworkManager
|
||||
connman
|
||||
|
@@ -1,4 +1,4 @@
|
||||
#!/bin/sh -e
|
||||
#!/bin/sh
|
||||
|
||||
if [ ! -x /usr/bin/X ]; then
|
||||
echo "SKIP autologin: X not installed" >&2
|
||||
|
@@ -23,6 +23,18 @@ DOMAINNAME="localdomain"
|
||||
verbose "Init /etc/hosts with 127.0.0.1 localhost"
|
||||
echo "127.0.0.1 localhost localhost.localdomain" > /etc/hosts
|
||||
|
||||
prefix="/etc/net/ifaces"
|
||||
|
||||
# seems like aufs bug on O_TRUNC writes:
|
||||
# aufs au_lkup_neg:267:kworker/0:2[998]:
|
||||
# I/O Error, resolv.conf should be negative on b0.
|
||||
# OTOH lo interface is now brought up in initrd
|
||||
# so this shoudn't really matter
|
||||
if [ -d "$prefix"/lo ]; then
|
||||
echo 'nameserver 8.8.8.8' >> "$prefix"/lo/resolv.conf
|
||||
fi
|
||||
find /var -name resolv.conf -or -name nsswitch.conf -delete
|
||||
|
||||
netcfg="/etc/sysconfig/network"
|
||||
|
||||
verbose "Enable networking, set hostname to $HOSTNAME, domainname to $DOMAINNAME"
|
||||
@@ -30,21 +42,22 @@ shell_config_set "$netcfg" NETWORKING yes
|
||||
shell_config_set "$netcfg" HOSTNAME "$HOSTNAME"
|
||||
shell_config_set "$netcfg" DOMAINNAME "$DOMAINNAME"
|
||||
|
||||
|
||||
if [ -x /usr/sbin/NetworkManager ] ; then
|
||||
verbose "Setup defaults for NetworkManager"
|
||||
shell_config_set /etc/net/ifaces/default/options-eth NM_CONTROLLED yes
|
||||
shell_config_set /etc/net/ifaces/default/options-eth DISABLED yes
|
||||
shell_config_set /etc/net/ifaces/default/options-eth BOOTPROTO dhcp
|
||||
# NB: see also #28484 and livecd-net-eth for runtime configuration
|
||||
defcfg="$prefix/default/options-eth"
|
||||
if [ -x /usr/sbin/NetworkManager -o -x /usr/sbin/connmand ] ; then
|
||||
verbose "Setup defaults for NetworkManager/connman"
|
||||
shell_config_set "$defcfg" NM_CONTROLLED yes
|
||||
shell_config_set "$defcfg" DISABLED yes
|
||||
shell_config_set "$defcfg" BOOTPROTO dhcp
|
||||
else
|
||||
# attempt to autoconfigure ethernet by etcnet
|
||||
if [ -x /sbin/dhcpcd -o -x /sbin/dhclient ]; then
|
||||
if [ -x /lib/udev/write_net_rules ] &&
|
||||
[ -x /sbin/dhcpcd -o -x /sbin/dhclient ]; then
|
||||
verbose "configuring DHCP for eth0"
|
||||
|
||||
mkdir -p /etc/net/ifaces/eth0 && {
|
||||
mkdir -p "$prefix"/eth0 && {
|
||||
echo TYPE=eth
|
||||
echo BOOTPROTO=dhcp
|
||||
} > /etc/net/ifaces/eth0/options
|
||||
} > "$prefix"/eth0/options
|
||||
else
|
||||
verbose "NOT configuring eth0 for DHCP"
|
||||
fi
|
||||
|
@@ -82,7 +82,7 @@ bootargs: clean
|
||||
|
||||
clean: copy
|
||||
@if [ "$(SYSLINUX_UI)" = gfxboot ]; then \
|
||||
sed -i "s,\^,," $(DSTDIR)/*.cfg; \
|
||||
sed -i "s/\^//;/menu label /d" $(DSTDIR)/*.cfg; \
|
||||
fi
|
||||
|
||||
copy: prep
|
||||
|
@@ -72,3 +72,6 @@ use/x11/e17: use/x11/xorg use/x11/3d-free
|
||||
|
||||
use/x11/lxde: use/x11/xorg
|
||||
@$(call add,THE_LISTS,$(call tags,lxde desktop))
|
||||
|
||||
use/x11/fvwm: use/x11/xorg
|
||||
@$(call add,THE_LISTS,$(call tags,fvwm desktop))
|
||||
|
2
image.in/.gitignore
vendored
2
image.in/.gitignore
vendored
@@ -1 +1,3 @@
|
||||
build.log
|
||||
reports
|
||||
out
|
||||
|
@@ -65,7 +65,7 @@ profile/init: distclean
|
||||
fi >&2; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
mp-commit "$(BUILDDIR)" "derivative profile initialized"; \
|
||||
mp-commit -i "$(BUILDDIR)" "derivative profile initialized"; \
|
||||
if [ -w . ]; then \
|
||||
rm -f "$(SYMLINK)" && \
|
||||
ln -s "$(BUILDDIR)" "$(SYMLINK)" && \
|
||||
|
23
pkg.in/lists/domain-client
Normal file
23
pkg.in/lists/domain-client
Normal file
@@ -0,0 +1,23 @@
|
||||
pam_mount
|
||||
|
||||
samba4-client
|
||||
cifs-utils
|
||||
keyutils
|
||||
nfs-clients
|
||||
autofs
|
||||
installer-feature-auto-domain
|
||||
installer-feature-nfs-client-stage3
|
||||
installer-feature-start-avahi
|
||||
installer-feature-network-shares-client-stage3
|
||||
installer-feature-weak-passwd
|
||||
libnss-fallback
|
||||
libnss-mdns
|
||||
|
||||
krb5-ticket-watcher
|
||||
|
||||
alterator-browser-qt
|
||||
alterator-standalone
|
||||
|
||||
alterator-auth
|
||||
alterator-net-shares
|
||||
|
@@ -1,5 +1,6 @@
|
||||
gdisk
|
||||
parted
|
||||
fatresize
|
||||
dosfstools
|
||||
grub2-efi
|
||||
elilo
|
||||
|
@@ -9,6 +9,7 @@ livecd-online-repo
|
||||
apt-repo
|
||||
update-kernel
|
||||
synaptic-usermode
|
||||
eepm
|
||||
|
||||
alterator-standalone
|
||||
cpufreq-simple
|
||||
|
6
pkg.in/lists/tagged/desktop+fvwm
Normal file
6
pkg.in/lists/tagged/desktop+fvwm
Normal file
@@ -0,0 +1,6 @@
|
||||
fvwm
|
||||
fvwm-doc
|
||||
fvwm-icons
|
||||
fvwm-themes
|
||||
fvwm-crystal
|
||||
xterm
|
@@ -3,4 +3,6 @@ xinit
|
||||
xinitrc
|
||||
livecd-setlocale
|
||||
installer-feature-runlevel5-stage3
|
||||
os-prober
|
||||
sudo
|
||||
su
|
||||
|
@@ -1,6 +1,7 @@
|
||||
openbox
|
||||
|
||||
pcmanfm2
|
||||
eject
|
||||
|
||||
lxde-common
|
||||
lxde-lxpanel
|
||||
@@ -16,4 +17,7 @@ lxde-lxshortcut
|
||||
menu-cache
|
||||
altlinux-freedesktop-menu-lxde
|
||||
|
||||
# NB: an lxde-settings is required by lxde-common
|
||||
lxde-settings-altlinux
|
||||
|
||||
tango-icon-theme
|
||||
|
@@ -1,8 +1,8 @@
|
||||
tango-icon-theme-extras
|
||||
|
||||
# lxterminal is reportedly sub-par (gns@) but official (aen@)
|
||||
lxde-lxterminal
|
||||
#sakura
|
||||
#lxde-lxterminal
|
||||
sakura
|
||||
fonts-bitmap-terminus
|
||||
|
||||
leafpad
|
||||
galculator
|
||||
|
Reference in New Issue
Block a user