0.9.7-alt1

- going nightly
live: tweak 50-setup-network regarding resolving
2013-02-11 21:43:46 +04:00 · 2013-02-11 21:29:16 +04:00 · 2013-02-11 21:29:16 +04:00 · 2013-02-11 21:29:15 +04:00 · 2013-02-11 21:29:15 +04:00 · 2013-02-11 21:29:15 +04:00
16 changed files with 84 additions and 29 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.9.6
+Version: 0.9.7
 Release: alt1
 Summary: ALT Linux based distribution metaprofile
@@ -78,6 +78,9 @@ cp -a * %buildroot%mpdir
 %doc %docs/*
 %changelog
 * 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
--- a/.gear/tags/486bf7868d0df7b513fbfe0b048b84d15b177297
+++ b/.gear/tags/486bf7868d0df7b513fbfe0b048b84d15b177297
@@ -1,6 +0,0 @@
 object b74ad4d592498d38a81757d4534afecd9b18a8bf
 type commit
 tag v0.9.5
 tagger Michael Shigorin <mike@altlinux.org> 1358785513 +0200
 homeros
--- a/.gear/tags/a3ac943cc53163809f63f514f0f0cc33fff19119
+++ b/.gear/tags/a3ac943cc53163809f63f514f0f0cc33fff19119
@@ -0,0 +1,6 @@
 object 5fcc2aaa78b5704b4bc4ec448322680efa2cc332
 type commit
 tag v0.9.6
 tagger Michael Shigorin <mike@altlinux.org> 1360001972 +0400
 assorted fixes
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-486bf7868d0df7b513fbfe0b048b84d15b177297 v0.9.5
+a3ac943cc53163809f63f514f0f0cc33fff19119 v0.9.6
--- a/bin/mp-commit
+++ b/bin/mp-commit
@@ -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
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -4,15 +4,20 @@ 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/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,STAGE1_PACKAGES,udev-rule-generator-net)
 	@$(call add,STAGE2_PACKAGES,udev-rule-generator-net)
 	@$(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,7 +27,6 @@ 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)
@@ -32,14 +36,15 @@ distro/regular-cinnamon: distro/.regular-desktop use/x11/cinnamon
 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
--- a/conf.d/server.mk
+++ b/conf.d/server.mk
@@ -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
--- a/features.in/efi/config.mk
+++ b/features.in/efi/config.mk
@@ -9,7 +9,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
--- a/features.in/live/live/image-scripts.d/03-services
+++ b/features.in/live/live/image-scripts.d/03-services
@@ -33,6 +33,7 @@ livecd-hostname
 livecd-save-nfs
 livecd-setauth
 livecd-setlocale
 livecd-net-eth
 network
 NetworkManager
 connman
--- a/features.in/live/live/image-scripts.d/50-setup-network
+++ b/features.in/live/live/image-scripts.d/50-setup-network
@@ -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"
-
+# NB: see also #28484 and livecd-net-eth for runtime configuration
-if  [ -x /usr/sbin/NetworkManager ] ; then
+defcfg="$prefix/default/options-eth"
-	verbose "Setup defaults for NetworkManager"
+if  [ -x /usr/sbin/NetworkManager -o -x /usr/sbin/connmand ] ; then
-	shell_config_set /etc/net/ifaces/default/options-eth NM_CONTROLLED yes
+	verbose "Setup defaults for NetworkManager/connman"
-	shell_config_set /etc/net/ifaces/default/options-eth DISABLED yes
+	shell_config_set "$defcfg" NM_CONTROLLED yes
-	shell_config_set /etc/net/ifaces/default/options-eth BOOTPROTO dhcp
+	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 "$prefix"/eth0 && {
 		mkdir -p /etc/net/ifaces/eth0 && {
 		echo TYPE=eth
 		echo BOOTPROTO=dhcp
-		} > /etc/net/ifaces/eth0/options
+		} > "$prefix"/eth0/options
 	else
 		verbose "NOT configuring eth0 for DHCP"
 	fi
--- a/features.in/syslinux/generate.mk
+++ b/features.in/syslinux/generate.mk
@@ -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
--- a/image.in/.gitignore
+++ b/image.in/.gitignore
@@ -1 +1,3 @@
 build.log
 reports
 out
--- a/lib/profile.mk
+++ b/lib/profile.mk
@@ -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)" && \
--- a/pkg.in/lists/domain-client
+++ b/pkg.in/lists/domain-client
@@ -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
--- a/pkg.in/lists/tagged/base+efi
+++ b/pkg.in/lists/tagged/base+efi
@@ -1,5 +1,6 @@
 gdisk
 parted
 fatresize
 dosfstools
 grub2-efi
 elilo
--- a/pkg.in/lists/tagged/base+regular
+++ b/pkg.in/lists/tagged/base+regular
@@ -5,6 +5,7 @@ strace
 powertop
 acpi
 livecd-net-eth
 livecd-online-repo
 apt-repo
 update-kernel
Author	SHA1	Message	Date
Michael Shigorin	eb569544ca	0.9.7-alt1 - going nightly	2013-02-11 21:43:46 +04:00
Michael Shigorin	77f1459f52	live: tweak 50-setup-network regarding resolving The issue has shown up in regular-*-20130207: /etc/resolv.conf would suddenly be empty upon successful bootup in virtualbox with a single DHCP configurable ethernet. dmesg has some trouble signs: aufs au_lkup_neg:267:kworker/0:2[998]: I/O Error, resolv.conf should be negative on b0 sem@ tells something like that has been seen before in a different configuration (multiple aufs overlays with /etc/ and /var sitting in different ones resulting in broken hardlinks); rescue boot with a test "echo > /etc/resolv.conf" yields an I/O error either. The patch is loosely based upon livecd-net-eth and m-p-d::profiles/live/image-scripts.d/init3-{network,resolve}. See also #28484 for the (still ongoing) discussion.	2013-02-11 21:29:16 +04:00
Michael Shigorin	28f7f9be27	regular.mk: get good ol' interface naming back enp0s3 is quite inferior to eth0 in terms of usability even if it might be more convenient for the machine{,ry}. Let's stick with what works here in ALT Linux (see #28484).	2013-02-11 21:29:16 +04:00
Michael Shigorin	cec6b26207	live: employ livecd-net-eth Once upon a time the first and only ethernet interface on a Linux system used to be known under the name of eth0; but years passed and the systemd shadow has drawn closer even to the seemingly remote areas like interface names. In short, it might get named e.g. enp0s3 (a more human friendly name of course) and the exact name is to be figured out in runtime as well. Sigh.	2013-02-11 21:29:15 +04:00
Michael Shigorin	96bdf36935	regular.mk: added r8168 See #28390, #28473 and #28471; thanks zerg@ for reminder.	2013-02-11 21:29:15 +04:00
Michael Shigorin	c12f0c17bc	syslinux: drop "menu label" for gfxboot The issue is that gfxboot's gettext support works on "label" strings but doesn't work properly on "menu label" ones as of 4.04 (the "menu label" translations pop up in the "Loading ..." window but menu items themselves are unaffected thus untranslated). NB: debian wheezy's syslinux-4.05 package patchset contains somewhat related 07-gfxboot-menu-label.patch; might be worth attention given that debian folks participate in upstream.	2013-02-11 21:29:15 +04:00
Michael Shigorin	5834dac8c8	server.mk: added mdadm, lvm support to server-mini Pretty natural but delayed somehow...	2013-02-11 21:29:15 +04:00
Michael Shigorin	6a554e21ab	regular.mk: added domain-client pkglist It's specified in http://altlinux.org/regular and it rather modest (~13M image size growth on i586).	2013-02-11 21:29:15 +04:00
Michael Shigorin	313b279d40	added domain-client pkglist See also http://altlinux.org/domain for description; this should allow for client support.	2013-02-11 21:29:15 +04:00
Michael Shigorin	ad264c7033	fixed mp-commit and its use Now this is ugly: instead of commoditizing the repetitive code the result ended up working differently by creating several repositories for the target subdirs instead of the single one for the generated subprofile as a whole. This results in .disk/profile.tgz being basically useless in every image since `c4311108ea`.	2013-02-11 21:29:15 +04:00
Michael Shigorin	ec8bcac5ff	image.in: extended .gitignore a bit These generated directories aren't part of a profile itself.	2013-02-11 21:29:15 +04:00
Michael Shigorin	3161ec500b	regular.mk: use branding*graphics for gtk based The same "regular-gtk" based set of images received common desktop background provided; note that kde4 won't like it (branding package didn't really anticipate kde4 and is to be updated appropriately as well as extended for mate/fvwm). This one is also used for lightdm/gtk.	2013-02-11 21:29:15 +04:00
Michael Shigorin	458d72b8c3	regular.mk: switch from gdm2.20 to lightdm/gtk "regular-gtk" based images moved from the (unsupported) gdm2.20 to the (supported) lightdm with gtk greeter; while a couple of gdm2 forks have emerged it's still unclear whether mate or mint one will be actually alive, even short/mid-term.	2013-02-11 21:29:15 +04:00
Michael Shigorin	d83eb78762	efi: added fatresize Helps with #28470 (FAT not being recognized) which is critical due to ESP being FAT by spec :-/ Thanks timonbl4@ for the hint.	2013-02-11 21:29:15 +04:00
Michael Shigorin	61ead13d3a	regular.mk: disable plymouth for gnome3-based distros The issue is that it's suddenly broken in current Sisyphus, looks like the peculiar set of assumptions in fedora-tweaked systemd+plymouth+gdm3 relies on tty1 being the X session tty and it's different here.	2013-02-11 21:29:09 +04:00
Michael Shigorin	d9ae996571	gear-store-tags	2013-02-04 22:19:49 +04:00
`@@ -1 +1 @@`
	`486bf7868d0df7b513fbfe0b048b84d15b177297 v0.9.5`	`a3ac943cc53163809f63f514f0f0cc33fff19119 v0.9.6`