Compare commits

...

469 Commits

Author SHA1 Message Date
Michael Shigorin
218b84ae09 1.1.52-alt1
- docs: "7.0+" (closes: #30474)
- l10n feature
2014-11-17 16:41:19 +03:00
Michael Shigorin
cbedb372e9 rescue+extra: added hddtemp
Thanks someone at opennet for bringing my attention to this:
http://www.opennet.ru/openforum/vsluhforumID3/100066.html#50
2014-11-16 22:01:43 +03:00
Michael Shigorin
c8a7e55cf8 QUICKSTART: it's p7/t7 or later now
0.6.3 has introduced some changes that were deemed incompatible
with t6/p6 branches; it should be possible to restore compatibility
at least for non-EFI images but the effort required hasn't been
up for grabs so far.

See also https://bugzilla.altlinux.org/30474
2014-11-16 21:34:36 +03:00
Michael Shigorin
be38098abf init: tweak to accomodate p7/t7 too
The problem with initial implementation (commit 62e7e9c)
is that there's no systemd-services package in p7/branch
thus apt complains about an attempt to remove something
that doesn't even exist in the first place.
2014-11-14 16:30:03 +03:00
Michael Shigorin
b5ff2b24b4 initial l10n feature
Aimed at live images at first but should cover installers as well.

This has been brewing for quite some time and while the proper
implementation is considerably more complex (and hard to do)
looks like there's demand for the particular important use case,
namely LiveCDs for Russian users, so this code has been shared
with a few people before merge.
2014-11-14 15:07:09 +03:00
Michael Shigorin
c293dd141c lib/functions.mk: tiny but important note
There's a particular problem with lazy evaluation
in case of BOOT_LANG: mkimage uses internal variable,
BOOT_LANG = $(GLOBAL_BOOT_LANG) (note the lack of
immediate assignment there), and if we set up

  export GLOBAL_BOOT_LANG = $(BOOT_LANG)

in the same namespace we end up with recursively
defined pair of variables; a ":=" in either place
would save the day _but_ it's not there in m-p due to
accumulator variables, e.g. USERS, which are defined
and exported by a corresponding feature and then get
populated *after* having been declared for export,
_and_ it's not in mkimage as of 0.2.16 for some reason
that might even be good (I don't know yet).
2014-11-14 15:07:09 +03:00
Gleb Fotengauer-Malinovskiy
5cede154fa x11: added use/x11/dwm target 2014-11-12 21:12:59 +03:00
Michael Shigorin
ac713ae6d7 gear-store-tags 2014-11-10 20:29:35 +03:00
Michael Shigorin
4e2e450b3a 1.1.51-alt1
- current updates
2014-11-10 20:29:03 +03:00
Michael Shigorin
3c5fe4a9f2 rescue+x11: added hardinfo
It has evaded sisyphus before but not anymore.
2014-11-06 20:00:19 +03:00
Michael Shigorin
15e79ba9fa desktop+lxqt: lxqt-appswitcher deprecated
See also https://github.com/lxde/lxde-qt/issues/302
2014-10-31 18:30:52 +03:00
Michael Shigorin
1078c61bd1 p7.mk: regular-lxqt-sysv bridge
...yet another one...
2014-10-29 18:14:17 +03:00
Michael Shigorin
de43d872b7 regular.mk: initial regular-lxqt-sysv
This has been asked for by lewellyn@freenode, why not.

NB: distro/.regular-sysv doesn't include use/net-eth/dhcp
    (as it looks like asking for) since there's still hope
    to get NM cooperating with sysvinit again.
2014-10-29 18:12:17 +03:00
Michael Shigorin
927d57d55a fonts: added google crosextra
Looks like there are more fonts out there than just croscore!
2014-10-29 16:11:52 +03:00
Michael Shigorin
9bfc92be10 gear-store-tags 2014-10-27 23:56:34 +03:00
Michael Shigorin
3261d94633 1.1.50-alt1
- minor tweaks
2014-10-27 23:54:52 +03:00
Michael Shigorin
1d7561925b regular.mk: gnome3: avoid initial setup
Both locale and keyboard have been set up already,
no use to waste time on those (which results in 'us'
keyboard layout missing out totally, ironically).

Thanks aris@ for the tip.
2014-10-27 14:25:14 +03:00
Michael Shigorin
0f7098ec2f live.mk: add shim to live-rescue
...basically giving it a chance to go with Secure Boot undisabled
which is a feature these days, unfortunately...
2014-10-27 12:45:22 +03:00
Michael Shigorin
48b29291ea power: i-f-cpufreq is no more
installer-feature-cpufreq-stage3 has been deleted from sisyphus.
2014-10-27 12:25:32 +03:00
Michael Shigorin
35841f144a server: added installer-feature-server-raid-fixup
This one adds write intent bitmaps for MD RAID;
see also #14877.
2014-10-24 16:55:39 +04:00
Michael Shigorin
9c5502b72c p7.mk: added lxqt bridge as well
It's been asked for already, let's not wait for December:
http://www.opennet.ru/openforum/vsluhforumID3/99418.html#48
2014-10-24 16:40:22 +04:00
Michael Shigorin
8ec8538be8 desktop_lxqt: dropped lxqt-config-randr
It's been obsoleted by lxqt-config in 0.8.0.
2014-10-15 01:52:32 +04:00
Michael Shigorin
35ec9f8901 regular.mk: icewm += liberation
Those URW fonts are scarey by today's standards :-(
Unfortunately these are pulled in by seamonkey & co...
2014-10-14 22:11:55 +04:00
Michael Shigorin
2c784c4a34 gear-store-tags 2014-10-13 22:26:06 +04:00
Michael Shigorin
503bb86593 1.1.49-alt1
- pkglist updates
2014-10-13 22:24:05 +04:00
Michael Shigorin
5edd7bbeee ovz-server: added openvz-etersoft
This package holds a nice collection of unofficial utilities
to deal with OpenVZ containers.
2014-10-12 19:26:52 +04:00
Michael Shigorin
c1eae11c7b rescue+extra: a bunch of FUSE-based filesystems
There are quite a few potentially useful packages
implementing FUSE based (userspace) filesystems,
these are typically lightweight and still might be
helpful to someone stuck with our rescue image...
2014-10-12 19:26:42 +04:00
Michael Shigorin
218c98ba11 rescue+extra: added shake
This one lurked under my radar so far as well.
2014-10-10 22:04:44 +04:00
Michael Shigorin
b3cc5db11c rescue+extra: added fuse-funion as well
ALT Linux LiveCD/Rescue images use AUFS currently,
some tools to access unionfs might be useful.
2014-10-10 21:34:35 +04:00
Michael Shigorin
ef1d8b77f5 rescue+extra: added iozone
Wonder how it managed to evade this list before...
2014-10-10 21:32:35 +04:00
Michael Shigorin
f24314bb00 initial desktop+xfce+extra
xfdashboard is a GNOME Shell-like window switching interface
and application runner; xfce4-whiskermenu-plugin is another
(KDE-like) menu search facility; thanks sem@ for suggestions.
2014-10-07 20:48:22 +04:00
Michael Shigorin
df583f1d45 desktop+lxqt+razorqt+extra: added qpdfview as well
It's a pretty solid PDF viewer;
pcmanfm-qt integration to be sorted out later.
2014-10-06 02:02:37 +04:00
Michael Shigorin
bdf96e4434 desktop+lxqt+razorqt+extra: added cool-retro-term
Just for the fun of it!
2014-10-06 01:58:16 +04:00
Michael Shigorin
57f9c1dff5 gear-store-tags 2014-09-29 23:49:57 +04:00
Michael Shigorin
a4d239af5e 1.1.48-alt1
- (sysv)init: exclude systemd explicitly
2014-09-29 23:47:46 +04:00
Michael Shigorin
0e0f1e065a vm.mk: added a note to bare one
It's not as bare as it should be due to interactivesystem
being slightly more than it ought to.
2014-09-29 15:59:20 +04:00
Michael Shigorin
62e7e9c152 init: ban systemd when sysvinit has been requested
The issue at hand is that interactivesystem pulls in
network-config-subsystem and that one has several providers
by now, systemd-networkd being one of them since recently
(and pulling in systemd).

Just the same problem as with systemd-journal; both might be
fixed by reworking mkimage to allow for different package name
resolution modes:

- "slap everything together and resolve with one-shot"
  to handle conflictless situations (most of those);
- "process multiple transactions to allow for conflicts"
  thus making it possible to include e.g. a few MTAs into
  the provided package base.

Ensure that systemd is outside by explicitly telling so
in the pkglist.
2014-09-29 15:59:19 +04:00
Michael Shigorin
ace7a118c0 live.mk: added live-webkiosk-qupzilla
...and factored out common gtk subtarget removing qt
(it's not exactly helpful to drop a library your browser
is based on in qupzilla case).
2014-09-29 11:05:55 +04:00
Michael Shigorin
184a52aa33 desktop+lxde+extra: added lxde-lxlauncher
This one isn't in menus even but is quite nice for semi-kiosks
it seems; well worth further attention, and let it lurk around
just in case.
2014-09-27 00:26:58 +04:00
Michael Shigorin
3fc56a10e1 x11: disable acpid for e19
E19 would ask the user if they want to shut down
when facing power button event; it won't get a chance
though as the system will hurl down immediately as per
acpid-events-power package provided configuration.
2014-09-23 19:39:52 +04:00
Michael Shigorin
1a3a6ec461 gear-store-tags 2014-09-22 20:00:37 +04:00
Michael Shigorin
e13c7fddad 1.1.47-alt1
- kpackages() argswap
2014-09-22 19:59:58 +04:00
Michael Shigorin
11d07b004b s/e18/e19/g
It has arrived to sisyphus last week silently,
thanks aris@ (#30253).
2014-09-22 15:48:47 +04:00
Michael Shigorin
4a6a88826c live.mk: tweak webkiosks regarding hybrid/efi
-mini image should be flash-friendly to be more useful,
and -flash bugtraq kitchen sink could use/efi as well.
2014-09-19 21:01:36 +04:00
Michael Shigorin
a3ddce7a81 functions.mk: allow setting to an empty value
set() is a function of two variables but the and()
check for *both* is incorrect as one might need to
override a previously set variable with empty string;
this has manifested itself with a case like this:

  @$(call set,ROOTPW_EMPTY,1)
  # ...
  @$(call set,ROOTPW_EMPTY,)
2014-09-19 21:01:08 +04:00
Michael Shigorin
2fa7259510 deflogin: more explicit ROOTPW_EMPTY handling
This should avoid ruining principle of the least surprise
with ROOTPW_EMPTY=0 or ROOTPW_EMPTY=n actually *enabling*
empty root password; overriding an already set "1" with "0"
becomes possible either.
2014-09-19 20:58:47 +04:00
Michael Shigorin
3c95cf8d8f live.mk: tweak live-builder*
That is, move use/efi/signed from basic -mini image
to the complete one; make the former isohybrid but
otherwise keep it small.
2014-09-19 20:58:03 +04:00
Michael Shigorin
4abb3688ff test.mk: several test PID 1 images
These started out with the now-classic vi and emacs ones,
elinks has been the next step, and bash helps debugging.
2014-09-19 20:54:25 +04:00
Michael Shigorin
1a7eed303d pid1: initial "run as PID 1" feature
This one has been inspired by these guys:

  http://www.informatimago.com/linux/emacs-on-user-mode-linux.html
  https://raymii.org/s/blog/Vim_as_PID_1_Boot_to_Vim.html

It's aimed at building images running their main userspace
piece instead of ramdisk's init, that means PID=1, UID=0.

Mostly fun of course but it suddenly became interesting with
kernel IP autoconfiguration and e.g. elinks running this way
(NB: requires patched make-initrd 0.8.8 at the moment to get
resolver configured).

And startup times are way better than sysvinit and systemd combined!
2014-09-19 20:53:25 +04:00
Michael Shigorin
6f452182fd fix kpackages() API
This function's got its argument order chosen for "aesthetical"
reason of $(2) following $(1) in the macros but the logical order
is exactly the opposite: we care for kernel flavour much more than
for module set (which is dependent upon it).

So while silent dropout of kernel-image if KFLAVOURS is set
but KMODULES is empty could be fixed by testing for $(2) only,
it looks like a good time to fix this discrepancy altogether.
2014-09-19 20:53:25 +04:00
Michael Shigorin
8faf140777 kernel, stage2: rearranged initrd hooks
stage2 has been thinking it's synonymous with propagator
and used to usurp kernel's belongings either; carefully
tear scripts apart so that kernel feature makes sure
initrd gets generated, and stage2 (which is still all
about propagator) cares for its bits.
2014-09-19 20:53:24 +04:00
Michael Shigorin
730e791fec stage1: fix for non-propagator stage2
It's been a given that any stage2 is propagator-based
but that's not neccessarily so; the "run X as PID 1"
sort of contest has sparkled interest in some others.
2014-09-19 20:52:19 +04:00
Michael Shigorin
5c4f116b3a vmguest: handle vmware x11 driver
xorg-drv-vmware is desirable for guests with X11
but undesirable for text-only ones; let's provide
this knob at least but ideal m-p would figure out
that an image with use/x11 and use/vmguest/vmware
should receive this intersection either.
2014-09-19 20:52:18 +04:00
Michael Shigorin
00244a0752 gear-store-tags 2014-09-15 22:22:00 +04:00
Michael Shigorin
71fba777a3 1.1.46-alt1
- regular fixes
2014-09-15 22:20:54 +04:00
Michael Shigorin
4aaba411a4 live.mk: better fonts for webkiosks
IOW URW EOL
2014-09-15 13:01:50 +04:00
Michael Shigorin
abad845978 regular.mk: added google fonts to regular-mate
This aims to work around URW fonts deficiencies combined
with the relatively high position of their standard ones
in default /etc/fonts/conf.avail/60-alt-post-user.conf;
see also #30293, #30294.
2014-09-15 13:01:45 +04:00
Michael Shigorin
bf3365a376 regular.mk: oops, sysv-tde needs better fonts too
This has missed 20140912 starterkits unfortunately,
nightly builds excluding installers didn't catch it
and beta testing hasn't uncovered this either.
2014-09-15 13:00:39 +04:00
Michael Shigorin
a51b7096fd regular.mk: make jeos isohybrid at least
It's not EFI-bootable due to the extra size penalty
with current build/boot technology, but it's also
not ISO-hybrid as most images are made hybrid by
making them EFI-capable as well since the processes
are related.

Thanks dango at the forum for asking:
http://forum.altlinux.org/index.php/topic,33094.msg236808.html#msg236808
2014-09-15 12:59:56 +04:00
Michael Shigorin
efa6188629 regular.mk: disabled alteratord for server-hyperv
Makes no sense without ahttpd anyways;
thanks lewellyn@freenode again.

Disable bridge service as well
(gotta figure out what pulls it in).
2014-09-15 12:59:00 +04:00
Michael Shigorin
c94376357e gear-store-tags 2014-09-01 20:11:22 +04:00
Michael Shigorin
e128a91075 1.1.45-alt1
- starterkits alpha
2014-09-01 20:10:51 +04:00
Michael Shigorin
195f20921f rescue+extra: added archivemount
Borders with archive+extra but that one contains standalone tools
and this is a FUSE-based one -- with more of those included in this
particular pkglist already; if we decide that it's a worthy addition
to any image requesting a bunch of archiving tools then it might move.
2014-08-31 16:23:37 +04:00
Michael Shigorin
e162e85305 desktop+wmaker+extra: note wmvolman
It's useless as of right now:
- menu file and udisks2 dependency are missing
- udisks2 itself lacks an initscript

Let's note these deficiencies at least...
2014-08-31 00:02:27 +04:00
Michael Shigorin
73c644fc28 net: backup 4.2.2.x public nameservers
Using just a single one of those tends to end up problematic
at times but any two use to suffice.
2014-08-30 21:36:24 +04:00
Michael Shigorin
84fd73e5db firmware: factored out kmodules to kernel
Maybe firmware feature should be merged into kernel feature
as the firmware binaries added by it are only used by kernel
but let's clean up a bit at a time.
2014-08-29 15:38:43 +04:00
Michael Shigorin
851b441378 profile.mk: defer RC expansion
Just spotted that .disk/profile.tgz would hold
distcfg.mk with pre-expanded $(HOME) from build
host which is both info leak (user account that
was used to build the particular image) and just
wrong given that the in-image profile archive was
conceived as a means to pass that part of build
environment over instead of tying it to vendor.

Morale: premature optimization is premature.
2014-08-27 22:30:59 +04:00
Michael Shigorin
d804203bc7 rootfs: README update
It should state clearly both the positive and negative examples
of rootfs concept use (its name is not consiceenough unfortunately,
and I haven't come up with a better one yet).
2014-08-27 22:30:14 +04:00
Michael Shigorin
ca34287e85 server.mk: amend net-eth usage either
+net-eth covers both stage2 and base installation parts
while use/stage2/net-eth would result in an inobvious
catch when udev-rule-generator-net would hit install2
but not the installed system, and interface bindings
would be carried over from installer to the installation
but would *not* be updated in case of changed network
card(s) configuration.
2014-08-26 23:12:02 +04:00
Michael Shigorin
559714a271 desktop.mk: refactor net-eth usage with +net-eth
It was spilled over an intermediate target and a mixin
for what looks like no good reason; let's factor these
in by means of +net-eth as *both* are really needed
for an installer anyways, and if/when we do installers
with those new and crippled ethernet interface names
this addition can be dropped to be used where required.
2014-08-26 22:38:45 +04:00
Michael Shigorin
7c9794a827 regular.mk: +net-eth for consistency
The bare intermediate target did use/stage2/net-eth but it
was found out by sem@ that an installed server would lack
udev-rule-generator-net package so its ethernet interface
naming would be inherited from install2 stage only; fix it
by adding use/net-eth and reduce the churn with +net-eth.
2014-08-26 22:36:21 +04:00
Michael Shigorin
8533f7e2b7 net-eth: added plus-shortcut
"use/stage2/net-eth use/net-eth" would be common enough
for installers or livecd images to just get these pulled in
together by a convenient shortcut thus reducing confusion
and chances to just forget one of these counterparts.
2014-08-26 22:24:45 +04:00
Michael Shigorin
2a0482ceee regular.mk: use/net/nm/mmgui in a few images
Namely cinnamon, tde and kde4 flavours for the starters.
2014-08-20 17:30:15 +04:00
Michael Shigorin
2897fe80ce net: added modem-manager-gui provider target
sem@ says it works at the moment, the utility is useful
to look up account status or handle SMS.
2014-08-20 17:26:55 +04:00
Michael Shigorin
3b35a8f4b3 exterminate fonts-ttf-dejavu all over the place
It looks *ugly* on-screen, at least within regular builds,
even if the screen is 166dpi.

Based on a quick experiment this morning I'd suggest using
fonts-otf-adobe-source-{code,sans}-pro instead -- and it's
available as use/fonts/otf/adobe now, incidentally.

The documentation is still built with it though as a2x/fop look
unhappy otherwise (as in replacing Cyrillic glyphs with "#"s).
2014-08-19 20:42:45 +04:00
Michael Shigorin
362fd3f048 fonts: add a few font collection targets
Font packages are sprinkled all over the metaprofiles,
let's try and help make their use more systematic.

This is a sort of a feature abuse as it was conceived
for fontconfig setup originally but spawning features
with confusing names looks grim; so let all things fonts
live within a feature named "fonts" for the time being.
2014-08-19 20:42:21 +04:00
Michael Shigorin
f16bd1e1ca gear-store-tags 2014-08-18 23:52:45 +04:00
Michael Shigorin
0e2faed186 1.1.44-alt1
- connman fixup
2014-08-18 23:51:34 +04:00
Michael Shigorin
29818ff05a regular.mk: added mnt to regular-icewm
Thanks mithraen@ for creating a universal frontend script
for udisksctl/pmount/hmount user mount tools; let's try it
within the minimalistic GUI image for the starters.
2014-08-18 23:51:34 +04:00
Michael Shigorin
36f51401d7 desktop+tde: drop obsolete cruft
These packages have been sitting there commented out
long enough to consider them for cleanup.
2014-08-18 22:41:01 +04:00
Michael Shigorin
5b0697393d stage1: READMEdability fix
Kernel modules come as both *.ko and kernel-modules-*.rpm
and it wasn't clear enough whether to mention "ahci" or "v4l".
2014-08-18 22:30:53 +04:00
Michael Shigorin
3171d693a3 main, metadata: README update
There's not much sense in overduplication of documentation
(tends to get stale faster then), still it's not good to
just refer to the code as the PDF/HTML book is less useful
then; maybe drifting towards "recommended" bits with more
"advanced" things being impleentation-defined is better.
2014-08-12 14:34:14 +04:00
Michael Shigorin
1eda19cff8 doc: better clean target
A bunch of intermediate files would be sitting around otherwise.
2014-08-12 13:15:08 +04:00
Michael Shigorin
24cee06517 net: enable connman service either
Stupid systemd will shadow connmand initscript with
connman.service but will not enable connman.service
when told to enable connmand initscript.  Sigh.
2014-08-12 12:18:55 +04:00
Michael Shigorin
38b153e20c rescue+extra: added lsmount
An udisks2-based removable device listing utility
courtesy of Speccyfighter and mithraen@:

http://lists.altlinux.org/pipermail/community/2014-August/682294.html
http://lists.altlinux.org/pipermail/community/2014-August/682326.html
http://lists.altlinux.org/pipermail/community/2014-August/682342.html
2014-08-11 14:15:44 +04:00
Michael Shigorin
428dafc2ab gear-store-tags 2014-08-04 20:58:35 +04:00
Michael Shigorin
c5f0493b33 1.1.43-alt1
- fixed package build
2014-08-04 20:57:21 +04:00
Michael Shigorin
18367944f0 rescue+extra: added screen, tmux
Wonder how these have been missing so far.
Thanks george@ for categorization. :)
2014-07-30 17:04:56 +04:00
Michael Shigorin
a44e3d5050 rescue+extra: added lsblk
Thanks mithraen@ for the hint:
http://lists.altlinux.org/pipermail/community/2014-July/682262.html
2014-07-30 13:21:06 +04:00
Michael Shigorin
a891a8e7e2 spec: tweaked BR for doc subpackage
fop doesn't pull any java virtual machine in anymore:
http://lists.altlinux.org/pipermail/sisyphus/2014-July/362665.html
2014-07-29 20:38:45 +04:00
Michael Shigorin
6077989527 gear-store-tags 2014-07-28 23:53:45 +04:00
Michael Shigorin
eace7a459f 1.1.42-alt1
- current bits
2014-07-28 23:52:27 +04:00
Michael Shigorin
41d537fb60 init: added tty12 log setup for systemd case
That's a part of ALT Linux conveniences: system log
messages at tty12 (helps immensely in case of disk crash
or cable problems as running anything, including utilities
to view logs, becomes painful to impossible in such cases).

systemd lacks this kind of setup out-of-box for sure
so zerg@ hacked a substitute together; just pull that in.
2014-07-28 20:11:24 +04:00
Michael Shigorin
e45fa5b090 desktop+wmaker: added basic bitmap fonts
vkni@ removed fonts-bitmap-cyr_rfx-iso10646-0400
from WindowMaker dependencies; I think that's wrong
but life is short so let's compensate that here as
at least regular-gnustep.iso degrades (GNUstep menus
are rendered in fixed bitmap font then).
2014-07-28 20:10:58 +04:00
Michael Shigorin
df042e7609 rescue+extra: added wdfs
Nice lil' WebDAV userspace filesystem; example:

wdfs https://webdav.yandex.ru /mnt/ydisk -o accept_sslcert,username=me@yandex.ru
2014-07-19 20:35:00 +04:00
Michael Shigorin
f6d895fcef rescue+fs: added cv
A nice little hack that looks up running instances of cp/mv/tar/gzip/...
in /proc and comes up with job completion percentage.  Useful when one
didn't bother to use pv(1) or the process has been running for quite
some time already.
2014-07-19 20:34:39 +04:00
Michael Shigorin
4f4dc888b4 gear-store-tags 2014-07-07 23:10:53 +04:00
Michael Shigorin
af1dd7205c 1.1.41-alt1
- post-214 fixups
2014-07-07 23:09:14 +04:00
Michael Shigorin
fc2c776303 regular.mk: moved lxqt from etcnet to NM
systemd-214 doesn't play well with service network currently,
gotta save users from timeout frustration until things get
sorted out, hopefully...
2014-07-02 02:22:53 +04:00
Michael Shigorin
16fba79f9d desktop.mk, pkglists: dropped sysklogd
There's no sense to duplucate sysklogd requirement
in plethora of fallback places when a specific feature
responsible for comprehensive init system choice has been
implemented since; just use/init/sysv as needed.
2014-07-02 01:51:45 +04:00
Michael Shigorin
935c8fc067 moved sysfsutils from base to misc rescue pkglist
shaba@ wonders if it's really needed as an auto-starting
service in regular livecd images, and it's probably not.
2014-07-02 00:34:52 +04:00
Michael Shigorin
0d9b33fdd7 regular.mk: ensure prefdm startup for kdm4
This hasn't been tweaked for systemd-214 yet,
and regular-kde4.iso should yield GUI at least.
2014-07-01 21:19:28 +04:00
Michael Shigorin
3e139f805d Revert "x11-autostart: ensure prefdm startup"
This reverts commit 81231ae5f7:
task #122722 contains a few display managers updated for
systemd-214.
2014-07-01 21:18:12 +04:00
Michael Shigorin
afcfaadc7e Revert "live: disable livecd-evms"
This reverts commit e48fe6c471:
livecd-evms has been updated to cope with systemd-214.
2014-07-01 21:16:32 +04:00
Michael Shigorin
60fe82d318 gear-store-tags 2014-07-01 00:00:04 +04:00
Michael Shigorin
730303bbe8 1.1.40-alt1
- systemd-214
2014-06-30 23:59:39 +04:00
Michael Shigorin
edbde16f6c regular.mk: tweak desktop services
systemd-214 has major problems with starting these services,
and KDC should definitely not even try to start up before
setup (which is not feasible given that these are LiveCDs).

domain-client pkglist inhabitants and net-usershares feature
are nasty enough to bring a lot of extra garbage in unfortunately
(alterator-auth, alterator-kdc, alterator-net-shares involved).
2014-06-30 23:58:30 +04:00
Michael Shigorin
81231ae5f7 x11-autostart: ensure prefdm startup
systemd-214 has broke things badly enough so that
graphical boot target is not effective anymore;
enabling prefdm explicitly helps though.
2014-06-30 23:58:30 +04:00
Michael Shigorin
e48fe6c471 live: disable livecd-evms
Looks like sysvinit-only services like this pose a major problem
for systemd-214 causing dependency cycles.
2014-06-30 23:58:29 +04:00
Michael Shigorin
6fd1c86412 live: s/fonts-ttf-droid/fonts-otf-mozilla-fira/
fonts-ttf-droid have been superseded by fonts-ttf-google-droid-sans
in Sisyphus which might be lacking; I've considered replacing it
with Fira anyways, so let's just do that.
2014-06-30 23:58:06 +04:00
Michael Shigorin
21433c117e README: explained wiki link
Some seem to be skipping it over for no good reason
while even unfinished HOWTO is much beta than nothin'.
2014-06-30 23:49:49 +04:00
Michael Shigorin
e0004a2621 added docs-publish toplevel goal
This one is long overdue as I keep forgetting to update
the published copy of generated documentation all the time.

Note that you must pass DOCS_PUBLISH (as a local directory
or host:dir suitable for rsync/ssh) via make arguments,
environment or ~/.mkimage/profiles.mk file.
2014-06-24 15:29:10 +04:00
Michael Shigorin
a2d79414b5 rescue+extra: added lnav
A cute little utility that can come handy
while inspecting a failed/broken system.
2014-06-23 16:06:27 +04:00
Michael Shigorin
af4d1aff44 desktop+lxqt+razorqt+extra: added qpdfview stub
Neither qupzilla nor pcmanfm-qt will fire this up
automatically when dealing with a PDF file so rather
adding a reminder to have a look at it some day.
2014-06-16 19:08:32 +04:00
Michael Shigorin
c31732f0be gear-store-tags 2014-06-16 17:39:12 +04:00
Michael Shigorin
489a41342b 1.1.39-alt1
- starterkits-20140612
2014-06-16 15:31:13 +04:00
Michael Shigorin
226a2395e5 net: 50-net-nm band-aid
This needs further refinement regarding p7/t7 specifically:
NM behaviour regarding defaults differs in sisyphus and this
has led to livecds booting with DHCP networking but installed
systems booting without configured interfaces.
2014-06-12 18:19:59 +04:00
Michael Shigorin
1061021b6a regular.mk: kludge to ensure nm-applet is around
Commit 78f2158 left those images which required NM but not
its applet explicitly broken (as in "no applet at all");
this should probably be redone alike to browser feature
but let's provide a 20140612 band-aid at least.
2014-06-12 18:10:31 +04:00
Michael Shigorin
41f247f7d2 regular.mk: server-hyperv shouldn't just start alteratord
I thought about this again and came to conclusion that bringing
alteratord and ahttpd up or down should rather be done at the same
time as backends and frontend are useless without each other
(at least for your average sysadmin).
2014-06-12 18:10:30 +04:00
Michael Shigorin
c4e71eda1c lists/monitoring: drop collectd-libvirt
This subpackage pulls in libvirt-client which is totally
overkill for your usual collectd (and it would need further
setup anyways).
2014-06-12 16:55:02 +04:00
Michael Shigorin
0d1aba87fb regular.mk: server-hyperv needs no cpufreq
Thus disabled cpufreq-simple service.
2014-06-12 03:12:13 +04:00
Michael Shigorin
0fa10b3a2f regular.mk: minor server-hyperv tweaks
Matt Lewandowsky suggested that alteratord be enabled
but ahttpd be disabled so as to avoid extra port being
listened to out-of-box but to be able to turn web GUI on
when needed.
2014-06-11 23:26:13 +04:00
Michael Shigorin
5d61d4ee34 regular.mk: added a few alterator modules to server-hyperv
As proposed by Matt Lewandowsky.
2014-06-11 23:26:13 +04:00
Michael Shigorin
ab40f6ead6 p7.mk: bridge gnustep as well
The packages have hit p7/branch, finally;
huge thanks to real@ for all the effort.
2014-06-11 23:26:12 +04:00
Michael Shigorin
a73d54b2f3 regular.mk: use/x11/kde4/nm instead of pkglist
This was the only user of that branch-specific pkglist.
2014-06-10 01:44:28 +04:00
Michael Shigorin
4a2e0be1b4 x11: add use/x11/nm/gtk target
This belongs to x11 feature and not to net feature since its
focus is a GUI, not the actual network-handling parts.

Or like that.
2014-06-10 01:44:28 +04:00
Michael Shigorin
78f21583cb net: rework NM support
Non-GUI packages moved to base+nm pkglist to enable standalone
installation of those; and GTK bits left in desktop+nm for use
by images lacking their own new and improved(tm) variant.

Note that both GNOME3 and KDE4 aren't lacking anymore.
2014-06-10 01:44:28 +04:00
Michael Shigorin
92c3e24adf x11: tweak for multi-branch compatibility
This is a similar trouble: p7/t7 branches had
plasma-applet-networkmanager while sisyphus has
switched to kde4-plasma-nm* (there's a bunch of
subpackages there, basically all of them desired).
2014-06-10 01:44:27 +04:00
Michael Shigorin
41a3f09132 browser: tweak for multi-branch compatibility
The current branches lack both firefox 29+ and
firefox-classic_theme_restorer, correspondingly;
sisyphus has those; the feature shouldn't pose
any problems in both cases, should it?
2014-06-10 01:43:32 +04:00
Michael Shigorin
796a82193d reports.mk: that space was extra
graphviz is usually around so this buglet has lived
a really long life: "a " "b" instead of "a" "b".
2014-06-04 19:09:11 +04:00
Michael Shigorin
97b229b616 regular.mk: use/install2/repo within installers
This has been requested by Matt Lewandowsky for hyperv server,
I think it's just reasonable in other installers as well.
2014-06-04 19:09:11 +04:00
Michael Shigorin
73485bc00f install2: initial use/install2/repo
This one uses an installer feature; should be reimplemented
using rootfs scripts carried over by installer some day.
2014-06-04 19:09:11 +04:00
Michael Shigorin
ba1557c04b Revert "regular.mk: go on vnc-free with sysv-tde"
This reverts commit c9ca03ffee.
2014-06-03 22:38:05 +04:00
Michael Shigorin
4f3738e93f regular.mk: use/install2/vnc
This addition enables installation over VNC as suggested
by frbrgeorge@.

Maybe live images should carry x11vnc too, not sure yet.
2014-06-03 22:07:28 +04:00
Michael Shigorin
1b7b7d86ff install2: added use/install2/vnc
This is the antagonist of the pre-existing cleanup;
suggested by frbrgeorge@ for starterkits.
2014-06-03 22:07:28 +04:00
Michael Shigorin
cb12a2d9b7 regular.mk: added usb-modeswitch to sysv-tde
As an available package, not default installation though.
Just in case.
2014-06-03 22:07:27 +04:00
Michael Shigorin
8838b25086 gear-store-tags 2014-06-02 23:52:06 +04:00
Michael Shigorin
a3e0ad22fd 1.1.38-alt1
- mksquashfs 4.3 support
2014-06-02 23:35:07 +04:00
Michael Shigorin
bf5032f9ae regular.mk: added gparted
Suggested by frbrgeorge@ and sounds quite reasonable
given that live-rescue.iso is very immature yet and
there are only a few -- but compelling -- reasons
to provide a graphical rescue image, gparted being
one of them for sure.
2014-06-02 21:28:40 +04:00
Michael Shigorin
82e5613090 dev: tweak hasher script hook order
This should have been done back when live feature
has been ported to use deflogin feature indeed :-/
2014-06-02 20:46:26 +04:00
Michael Shigorin
ab14528437 dev: added support for squashfs-tools 4.3
New mksquashfs requires /proc; mkimage 0.2.15 takes care for that;
it's time for this feature to get accustomed either.
2014-06-02 20:45:59 +04:00
Michael Shigorin
9c3abcdcb4 QUICKSTART: added howto reference
It's actually worth working into the offline docs probably
but it appears that overlooking this howto's existence is
easier than I thought; thanks manowar@ for pointing this out.
2014-06-02 20:45:41 +04:00
Michael Shigorin
715afbdccd rescue+x11: added extract
The libextractor utility; doesn't require libX11
but does requrie libgstreamer1.0 which is too much
for the plaintext image either.
2014-06-02 20:45:17 +04:00
Michael Shigorin
2ecb4cf169 gear-store-tags 2014-05-26 23:57:09 +04:00
Michael Shigorin
24fc192105 1.1.37-alt1
- use/browser
2014-05-26 23:28:17 +04:00
Michael Shigorin
fbe3abb5df regular.mk: moved bits to regular+tde
This is a no-op commit to clean up the mess a bit.
2014-05-26 23:28:00 +04:00
Michael Shigorin
e681df46f3 regular.mk, desktop+regular: shift hardware utilities
A few more packages suggested by Speccyfighter are more
generally useful than for regular-sysv-tde alone; let's
stick those into a pkglist instead.
2014-05-26 23:27:43 +04:00
Michael Shigorin
fdbe9bff09 regular.mk: use/browser
The logic is pretty much the same as with live.mk,
even somewhat extended as this has actually been
the driver of this change: some images like icewm
or lxqt-based ones might show off other browsers
explicitly (in addition to zerg@'s request).
2014-05-26 23:27:01 +04:00
Michael Shigorin
b9de03f79a live, live.mk: use/browser now
Firefox was the very reasonable default for initial livecd
implementation but now that at least initial browser chooser
infrastructure is in place it's time to un-hardwire its use.

It's _the_ default but switchable now so that images providing
a comprehensive browser can avoid feature duplication.
2014-05-26 23:26:36 +04:00
Michael Shigorin
d986baac50 initial browser feature
This one has been asking to be implemented for too long already,
and zerg@ was interested in a bit more lean and mean regular-kde4
either (there are two browsers provided with it via metapackage).

There's another reason to do it recently: Firefox Australis UI
is not exactly the best for many of us, and good ol' seamonkey
seems preferable for "vintage"/low-resource images coming with
icewm or windowmaker.
2014-05-26 23:26:36 +04:00
Michael Shigorin
c6c767cf1d rescue+extra: added wdiff
A humble utility which can be a huge time- and eye-strain saver.
2014-05-26 23:26:36 +04:00
Michael Shigorin
70ea7e04b0 desktop+lxqt+razorqt+extra: added quiterss
Tested, fixed and added finally.
2014-05-26 23:26:34 +04:00
Michael Shigorin
d51c6898bd gear-store-tags 2014-05-19 23:57:50 +04:00
Michael Shigorin
3517e32c37 1.1.36-alt1
- regular-lxqt
2014-05-19 23:57:03 +04:00
Michael Shigorin
b1174e14dc regular.mk: regular-rescue gfxboot warning
This should better lurk here unless someone (including myself)
either forgets or doesn't realize the inobvious chain of the
assumptions made for the read-only warranty to actually work.
2014-05-19 13:42:44 +04:00
Michael Shigorin
74f8fc45fb rescue+extra: added gammu
This is a nice small text utility which is immensely helpful
when dealing with good ol' phones.
2014-05-14 22:01:41 +04:00
Michael Shigorin
b14aff979f regular.mk: use/domain-client/full in "rich" images
This is actually downplaying: the net effect is that
a few images continue to carry krb5-ticket-watcher
and have avahi service enabled by default while most
of the images have one "weird" item less on their menus
and a few hundred kilobytes less in total RSS.

These are not really needed by default in lightweight
distros sporting reduced application and services set,
and the heavier ones will take relatively less hit
by default while being more ready as ALT Domain clients
(which was the whole motivation behind adding the feature
and the corresponding pkglist).
2014-05-13 22:33:04 +04:00
Michael Shigorin
db1e57d24a domain-client: split into two targets
The "full" one adds Kerberos ticket watcher GUI
and sets up avahi service to start automatically.
2014-05-13 22:33:04 +04:00
Michael Shigorin
2932305ea4 desktop+razorqt+extra: add lxqt tag
Renamed to desktop+lxqt+razorqt+extra
so that the name fits both searches.
2014-05-13 22:33:04 +04:00
Michael Shigorin
e694324ed2 regular.mk: initial regular-lxqt
Seems working already.
2014-05-13 22:32:17 +04:00
Michael Shigorin
c80fdb2910 x11: initial lxqt support
This is a sketch based on both lxde and razorqt bits.
2014-05-13 22:32:13 +04:00
Michael Shigorin
ecfde0bfe9 gear-store-tags 2014-05-13 00:28:20 +04:00
Michael Shigorin
c13d3e8938 1.1.35-alt1
- yet another rescue week
2014-05-13 00:26:12 +04:00
Michael Shigorin
b54300dc38 rescue+extra: added ftimes
Yet another forensic package suggested by Maxim Suhanov.
2014-05-13 00:26:12 +04:00
Michael Shigorin
6d9c9b9b77 rescue+extra: another foreignsic package
libpff-tools: Tools to access Microsoft PST and OST files
2014-05-13 00:26:10 +04:00
Michael Shigorin
e87895ef48 rescue+extra: added altquire
This package contains a custom dialog-based dc3dd frontend
aimed to help non-expert CLI users to deal with common tasks
involving full-drive imaging and contributed by Maxim Suhanov.
2014-05-13 00:25:14 +04:00
Michael Shigorin
c0d3472997 regular.mk: added dhcpcd, powerbutton handling to jeos
A virtual machine lacking DHCP client seems much less useful,
and being able to shut one down via emulated ACPI button press
seems like no luxury either.
2014-05-13 00:25:02 +04:00
Michael Shigorin
600febca30 vmguest, install2: add vmware modules
led-ws kernel flavour has gained kernel-modules-vmware
recently, let's add this to the appropriate targets.

It's used in regular-jeos already but THE_ part was missing.
2014-05-13 00:25:02 +04:00
Michael Shigorin
c74242f3b3 rescue+extra: added libevt* tools
As requested by Maxim Suhanov; libwrc has been a dependency
and yielded a tools subpackage too, included either.
2014-05-13 00:25:02 +04:00
Michael Shigorin
db4b3d10b2 live: don't chkconfig dm explicitly
dm service is set up to autostart when installed anyways,
and explicit `chkconfig dm on' results in it being turned on
at runlevels 2, 3 and 4 too which is really not needed.

Thanks led@ for spotting and reporting this.
2014-05-13 00:25:02 +04:00
Michael Shigorin
f5f3fae2bb regular.mk: changed wmaker flavour to led-ws
It appears that led-ws kernel flavour hasn't been tested
within regular builds which is a shame; let's fix that.
2014-05-13 00:25:00 +04:00
Michael Shigorin
ba7d145adb rescue+extra: added a few more tools
These are rather foreignsic:

liblnk-tools: Tools to access the Windows Shortcut File (LNK) format
libregf-tools: Utilities to inspect Windows REGF-type Registry files
libuna-tools: Utilities from libuna for Unicode/ASCII Byte Stream conversions
libvshadow-tools: Tools to access the Volume Shadow Snapshot (VSS) format

Suggested by Maxim Sunahov and ported from OBS packages.
2014-05-12 18:27:08 +04:00
Michael Shigorin
e3571f276a stage2, efi: added kernel config test collector
The newly-introduced STAGE1_KCONFIG variable serves
to keep those kernel configuration options that are
required to be present in the kernel to boot.
2014-05-12 18:27:08 +04:00
Michael Shigorin
0e98c9331a rescue+x11: added recoll
This software allows to (re)index and analyze
considerable bodies of unstructured documents.

The full metapackage, just in case.
2014-05-12 18:27:07 +04:00
Michael Shigorin
58cff0de20 rescue+extra: added nano
Maxim Suhanov suggested this to reduce stress for those
not used to the editor yet.
2014-05-08 13:26:30 +04:00
Michael Shigorin
9ab533f719 gear-store-tags 2014-05-05 23:57:31 +04:00
Michael Shigorin
e1200b037b 1.1.34-alt1
- remember Odessa
2014-05-05 23:56:25 +04:00
Michael Shigorin
24ead72484 build-distro: document META_* somewhat
Thanks msp@ for his proposal to provide at least some hints
regarding metadata related variables albeit further RTFM
is much recommended.
2014-05-05 23:50:44 +04:00
Michael Shigorin
ab84d06028 syslinux: "cdrom" notice
cfg.in/README should be explicit regarding
"automatic=method:cdrom" being usable for
flash media too (propagator has been fixed
since 20101130-alt10 or so, and gfxboot is
able to tweak the cmdline having figured
out it's running off the flash either).
2014-05-05 23:50:44 +04:00
Michael Shigorin
4fcf7e78c0 regular.mk: added asoundconf{,-gtk} to sysv-tde
Asked for by Speccyfighter:
http://lists.altlinux.org/pipermail/community/2014-April/682001.html
2014-05-05 23:50:43 +04:00
Michael Shigorin
43a3601075 rescue: locale band-aid
It's by no means substitution for proper l10n feature
but forcing users into POSIX locale for recovery ops
is no good at all.

This is basically a fork of live feature's 20-locale,
a font has been changed to save some face though.
2014-05-05 23:50:29 +04:00
Michael Shigorin
a6a3254b31 regular.mk: add vmware support to jeos flavour
This should provide the fix for #30024 (thanks ildar@):
vmware relies on mptspi.ko by default and that's been
split out into scsi and not guest subpackage for led-ws.

BTW use/install2/vmguest instead of a bunch.
2014-05-05 23:50:29 +04:00
Michael Shigorin
0276e25dd2 vmguest: add vmware support
Thanks ildar@ for #30024 and specifically mentioning
that mptspi.ko is missing in jeos flavour (using led-ws).
2014-05-05 23:50:29 +04:00
Michael Shigorin
d6c45593ef install2: add use/install2/{vmware,vmguest}
VMware specific bits went into use/install2/vmware target,
and all of those targets are worth their use/install2/vmguest
collective one instead of just sticking the kitchen sink into
use/install2/full immediately.
2014-05-05 23:50:29 +04:00
Michael Shigorin
8c580273c8 vmguest: s/virtualbox/vbox/ upon targets
So as to bring the name bits into harmony with use/install2 ones.
2014-05-05 23:50:29 +04:00
Michael Shigorin
d48d712414 regular.mk: use kde4-plasma-nm* plugins
plasma-applet-networkmanager has been superseded by a bunch
of kde4-plasma-nm* packages; only the main one has been included
in regular-kde4 flavour since the switch resulting in the lack of
VPN/mobile connectivity options.

My opinion still is that plasma-applet-networkmanager should be
returned as a metapackage for p7/branch timespan so that images
could be built no matter whether it's sisyphus or p7 at hand.

Oh well.
2014-05-05 23:50:29 +04:00
Michael Shigorin
561941a276 regular+kde4: added kde4-plasma-nm-connect-*
These plugins should be required by a metapackage providing
plasma-applet-networkmanager so that branch and sisyphus builds
use the same pkglist; let's add those explicitly while that's
not done yet.
2014-05-05 23:50:27 +04:00
Michael Shigorin
6b7a4f398f net-eth: expand stage2 comment
Just in case adding use/net-eth -> use/stage2/net-eth dependency
ever seems a good idea...
2014-05-05 15:48:21 +04:00
Gleb Fotengauer-Malinovskiy
7867f2c79f ve.mk: add ve/docker
A minimal chroot supporting extension via apt-get. Looks like the best
start for use with docker-io software.
2014-05-05 13:16:26 +04:00
Michael Shigorin
143ccc9b40 gear-store-tags 2014-04-28 22:07:59 +04:00
Michael Shigorin
2817b4d41d 1.1.33-alt1
- net-eth tweaks
2014-04-28 22:07:21 +04:00
Michael Shigorin
dbe1d17dd8 desktop.mk, vm.mk: just use/net-eth
No need to require udev-rule-generator-net explicitly here,
it's been factored out into that feature.
2014-04-28 21:28:29 +04:00
Michael Shigorin
02e484af36 net-eth: require udev-rule-generator-net
This feature intrinsically depends on predictable
ethernet interface names and makes no sense without
those; so it only seems reasonable to bring this
nice package in, huge thanks go to shaba@ of course.
2014-04-28 21:28:29 +04:00
Michael Shigorin
2d99b8a4a3 net: fix the comment
The issue at hand is that we must not reconfigure an interface
that NFS with the rootfs we're running off is mounted over.
2014-04-28 21:28:29 +04:00
Michael Shigorin
7a2b624b05 vm.mk: demo icewm image with "OEM" setup
This PoC will boot into locale and credentials setup GUI once
and should boot as usual ever since, that is into lightdm
in this case.
2014-04-28 21:28:28 +04:00
Michael Shigorin
05abfaa2d8 build-vm: don't use/deflogin indefinitely
There's working use/oem to provide initial setup now too,
default root/user logins are logically conflicting with it
most of the time.
2014-04-28 21:28:12 +04:00
Michael Shigorin
ba72520301 base+rescue: added eject
Looks like it might be expected there, why not:
http://www.opennet.ru/openforum/vsluhforumID3/95593.html#87
(out-2.ogv)
2014-04-28 21:28:12 +04:00
Michael Shigorin
61953b041f rescue+x11: added autopsy
It's finally packaged!
2014-04-28 21:28:10 +04:00
Michael Shigorin
dc8862a640 rescue+extra: added dd_rescue, ddrutility
There's a whole slew of improved dd(1) forks out there
and several more utilities around, some might stick to
this one and others to that one; let's try and make'em
all happy even if it's not really feasible...
2014-04-28 21:27:39 +04:00
Michael Shigorin
7540cbb918 rescue+misc: added parallel
It's pretty useful in some cases.
2014-04-28 21:27:39 +04:00
Michael Shigorin
88fa4ccfcb rescue+x11: add gksu
Some of the utilities included might make use of xdg-su indeed,
and that one needs at least one backend like this.
2014-04-28 21:27:38 +04:00
Michael Shigorin
752e1d9098 rescue+x11: added recoverjpeg
Thanks Aleksander Gorohovski for this list:
http://lists.altlinux.org/pipermail/community/2010-March/662609.html
2014-04-22 19:56:11 +04:00
Michael Shigorin
c1af93cf96 regular.mk: server-hyperv += hyperv-daemons
Package has been prepared by shaba@ and sem@,
and it looks like ALT Linux with un-def kernel
is one of the few (or just the one) distribution
running on Hyper-V Gen.2 rather flawlessly
thanks to efforts by boyarsh@ and vitty@.
2014-04-22 11:07:00 +04:00
Michael Shigorin
06601ebb1e gear-store-tags 2014-04-21 23:59:42 +04:00
Michael Shigorin
dfbf1a7268 1.1.32-alt1
- regular-rescue week
2014-04-21 21:47:44 +04:00
Michael Shigorin
edb32fc969 rescue+misc: added mpt-status
It's pretty limited but still useful for some LSI SAS controllers.
2014-04-21 20:44:31 +04:00
Michael Shigorin
b28d2ffcca deflogin: added uucp to hardware groups
This one relates to serial ports (including USB serial);
thanks dd@ for suggestion.
2014-04-21 20:27:53 +04:00
Michael Shigorin
9335e8f1cc base+regular: added usbutils
Suggested by dd@ and pretty reasonable.
2014-04-21 20:27:08 +04:00
Michael Shigorin
c08d18dd54 net-eth: fix ugly typo
That space before ']' was missing indeed :-/
2014-04-21 17:49:08 +04:00
Michael Shigorin
7a36fed411 rescue+extra: added aimage
Yes it's been obsoleted but guymager requires X11
and regular-rescue.iso is specifically text-based.
2014-04-19 19:44:02 +04:00
Michael Shigorin
81b4a3156b rescue+extra: added aff-tools explicitly
There's a nuance: libaff used to contain the utilities
and is required by sleuthkit; 3.7.4-alt1 has aff-tools
split into a subpackage of its own so we'd better keep
the binaries by adding this one.
2014-04-19 18:21:51 +04:00
Michael Shigorin
0839b22f97 regular.mk: rescue will use/mediacheck
This image has got stage2 vaildation in forensic mode,
let's add whole image checksum for good measure.
2014-04-19 13:48:12 +04:00
Michael Shigorin
bb37e68588 syslinux: slightly better mediachk label
It's not neccessarily installation media.

Shift boot order so that rescue image can get mediacheck too
but still boot into rescue by default.
2014-04-19 13:48:12 +04:00
Michael Shigorin
1a8d7e3126 syslinux: bump rescue loop device number limit
As proposed by Maxim Suhanov since there are only
7 loop devices available upon bootup which might be
not enough given ro,loop mounts by default.
2014-04-19 13:48:12 +04:00
Michael Shigorin
a2fcc601c9 syslinux: process @rescue_hash@ (forensic mode)
This value is used to authenticate rescue rootfs image
by verifying the squashfs file's sha256sum before use
(propagator-20140419+).

Looks like this check might be useful for other stage2
images as well but let's get started with this one.

Thanks Maxim Suhanov <suhanov/group-ib.ru> for both
http://www.forensicswiki.org/wiki/Forensic_Live_CD_issues
and propagator patches.
2014-04-19 13:48:11 +04:00
Michael Shigorin
635018aa86 base+rescue: added agetty
Found it in yet another TODO at last;
serial console support is requisite.
2014-04-19 13:47:53 +04:00
Michael Shigorin
9a124f1745 rescue+extra: a bunch of long tail packages
These are mostly less known ones lurking in Sisyphus;
some of those might go, some might stick.
2014-04-19 13:47:53 +04:00
Michael Shigorin
f7002d8373 rescue+{crypto,misc}: a few more additions
Massive Solutions' intranet wiki page on firmware
has proved useful yet again, and stegdetect has been
omitted given that steghide is there already.
2014-04-19 13:47:53 +04:00
Michael Shigorin
2f3614b2de rescue+x11: several more assorted GUIs
These have been spotted while working on text-based utility
package lists; dvdisaster is rather welcome on x11 pkglist too.
2014-04-19 13:47:52 +04:00
Michael Shigorin
2e86bfdab0 archive+extra: a few more microtools
xbiso is xbox xdvdfs iso extraction utility;
mdbtools helps use MS Access files.
2014-04-19 13:47:31 +04:00
Michael Shigorin
84a591471c syslinux: fix "forensic" wording
Thanks Maxim Suhanov (suhanov <AT> group-ib.ru,
http://www.forensicswiki.org/wiki/User:.FUF)
for taking the time to review regular-rescue image.

Note that there are more than just filesystems:
arrays, logical volumes and swaps aren't activated either;
startup-rescue >= 0.18 should make that clear enough.

syslinux shortcut handling is case-insensitive,
let's find yet another letter...
2014-04-19 13:47:31 +04:00
Michael Shigorin
b7d8a9862d {rescue,security}+extra: a few more utilities
biew was strangely missing indeed; several more
http://www.forensicswiki.org/wiki/Category:Tools
added as these have been packaged for ALT already;
fatback is on the way and dc3dd should come soon.

Debugging department has seen a /minor facelift/ too.

Some tools depend on X11 though and have been put
into a separate pkglist for that matter.
2014-04-15 19:48:57 +04:00
Michael Shigorin
c3d5683658 gear-store-tags 2014-04-14 23:33:21 +04:00
Michael Shigorin
485d93d37f 1.1.31-alt1
- live: refactoring
- forensics mode
2014-04-14 23:32:52 +04:00
Michael Shigorin
fce9b2e6a6 regular.mk: added forensics mode to rescue flavour
Just a convenient knob for a few things done previously
to help spare the interesting bits from being overrun.

NB: live_rw isn't added although it might be useful
    since that would yield too many boot targets overall;
    this is likely to change some day, hopefully when
    media type detection/handling is implemented.

Let's bump syslinux timeout to 20 seconds either
so that iKVM users have a chance to select anything
and not just see the default booting after a few
screen area size changes.
2014-04-14 23:32:16 +04:00
Michael Shigorin
22ead42a87 rescue+misc: added lsof
Wonder how it's been missing for 3+ years...
2014-04-14 21:11:06 +04:00
Michael Shigorin
8362a7b905 syslinux: add forensics mode
A variant of rescue that marks the need to be careful
towards block devices and filesystems thus reducing
the amount of auto-activation done by startup-rescue
(0.17 or newer).
2014-04-14 20:50:19 +04:00
Michael Shigorin
4cfac68563 live.mk: minor live-gimp updates
cvltonemap is no more available in sisyphus/p7;
xsane and usbutils were sorely missing (thanks dd@).

NB: fim is currently i586-only, need to fix or drop it.
2014-04-14 18:35:13 +04:00
Michael Shigorin
05371a6c25 server.mk, test.mk: added zabbix images
server-zabbix.iso is ready for deployment,
and live-zabbix.iso is zabbix agent + firefox
(needs at least Server to be specified properly
within zabbix_agentd.conf when booted).
2014-04-14 18:33:02 +04:00
Michael Shigorin
490ec2ec0d server: added zabbix target
This is a refactored result of Zabbix-related experiments;
we can do a rough zabbix server sketch that still requires
its own setup to go.

NB: both the pkglist and the target are describing several
distinct things actually: zabbix server, zabbix agent,
and the underlying SQL/HTTP/SMTP servers which might get
their own smaller targets some day.
2014-04-14 18:33:02 +04:00
Michael Shigorin
b79895681f server.mk: shift use/power/acpi/button to server-mini
It used to be added in server-ovz but it really belongs to
the underlying server-mini already as more images built
upon that one should perform correct shutdown given ATX
compatible case/mobo or a VM that can do ACPI.
2014-04-14 18:33:02 +04:00
Michael Shigorin
0e72c67e98 Revert "regular.mk: use imagewriter"
This reverts commit fd8f375573.
xdg-su is broken (some would say beyond repair) regarding DE
detection and handling of various GUI helper utilities,
especially in graceful fallback department; only a few images
can get imagewriter until this is fixed, let kde4 be the one.
2014-04-12 20:02:48 +04:00
Michael Shigorin
a9c9b032e8 live: use/deflogin (along with fixups)
It appears that live feature has been buggy regarding user
groups: its 30-users script would create a predefined account
with fixed supplementry groups list, and even if deflogin feature
got used too it would fail to add any groups to already existing
account since its useradd(8) call would fail.

Let's drop this duplication which has been long overdue anyways.

Thanks dd@ for both reporting the problem and carrying out
initial investigation.
2014-04-12 18:41:12 +04:00
Michael Shigorin
54609e4785 deflogin: refactoring and fixup
There have been several problems with this feature:
- a typo;
- non-existant GROUPS (even a single one) would block setting
  all of the supplementary groups but separately-set 'wheel';
- this feature isn't used much actually so sees no battle testing.

The typo has been just fixed; GROUPS are now applied by iteration
which is less effective but more reliable; an additional script
hook to write down login invitation for the first passwordless
account (if any) has been implemented; and several more group
managing targets have been added (based on live feature's script).
2014-04-12 18:32:40 +04:00
Michael Shigorin
0650f6d42d deflogin: explicit ROOTPW_EMPTY
This relates to commit f2892ad3e4
as there's an obvious need to be able to set empty root password
for LiveCDs but previous implementation was very fragile (and is
going to stay that way) -- so clear and separate knob for making
an image defenseless looks better.
2014-04-12 18:28:48 +04:00
Michael Shigorin
b9dffe2101 gear-store-tags 2014-04-07 23:39:02 +04:00
Michael Shigorin
c4d48c00b1 1.1.30-alt1
- robotics support
2014-04-07 23:38:32 +04:00
Michael Shigorin
ed75be87a1 syslinux: fix mediacheck label for gfxboot
Whoops, the very first build of a real distro with gfxboot
has shown that the label isn't picked up there... and things
are actually worse: iso.needscheck gfxboot test seems to look
up "check=1" in sectors where it might have been landing back
then but it's just not there by now; some kludgery is due in
branding-altlinux-sisyphus unfortunately.
2014-04-07 23:32:38 +04:00
Michael Shigorin
735eb6ea41 mediacheck: purge more packages
No use to hunt make or diff file-by-file.

Well this chroot should have been more lean
in the first place (or a few files in initrd)
but life is short so better use/baby/steps.
2014-04-07 23:32:38 +04:00
Michael Shigorin
8abdb7402b mediacheck: drop firmware/udev as well
These aren't needed in this subprofile but can sneak in
via e.g. SYSTEM_PACKAGES.
2014-04-07 23:32:38 +04:00
Dmitry Derjavin
172942243a Robotics related package list, feature and live-robo target added. 2014-04-04 15:49:34 +04:00
Michael Shigorin
b0adfd04c5 gear-store-tags 2014-03-31 23:59:32 +04:00
Michael Shigorin
97145c91f9 1.1.29-alt1
- mediacheck feature
2014-03-31 23:56:15 +04:00
Michael Shigorin
622fd2d160 regular.mk: gnustep will use/mediacheck
This is an experimental addition to an image that might
get some attention (and broken downloads as well).
2014-03-31 23:54:57 +04:00
Michael Shigorin
ae983176c0 test.mk: live-{isomd5sum=>mediacheck}
Update accordingly to feature change.

Note that the new image is quite minimalistic/useless.
2014-03-31 23:50:46 +04:00
Michael Shigorin
f28a83cac6 mediacheck: the former isomd5sum
This one is quite different already and utility-based name
was pretty clumsy; meet the new feature and retire the old
experimental one.

Please note that quite aggressive cleanups are implemented
within this stage2-based subprofile for the simple reason
that it has a single task to do; nothing else is expected
to be configured into it for that matter.

This functionality asks to be further moved into initrd of course;
adding it there will take a few more decisions to be made, mostly
regarding user interaction in failure scenarios, and it looks like
mkimage will have to be patched in case this doesn't just go into
full.cz under some sort of conditional check.
2014-03-31 23:50:00 +04:00
Michael Shigorin
71db9c6701 syslinux: support forthcoming mediacheck feature
Just a humble config snippet for another squashfs;
note that @bootargs@ aren't expected at all this time.
2014-03-31 23:50:00 +04:00
Michael Shigorin
44e778c9bd regular.mk, p7.mk: server-{un-def=>hyperv}
The whole story with this installer has been due to a query
at #altlinux whether there's a distribution image similar
to altlinux-p7-rescue.iso which appears to be booting under
Hyper-V Gen. 2 without a hitch; changing just the kernel
towards the newer one made the user rather happy since
everything worked out-of-box for him, even unimportant bits.

Of course it's mostly due to boyarsh@'s preceding work :)

NB: there's no use to build i586 version as that hypervisor
lacks CSM (BIOS implementation) and would only boot UEFI
compatible operating systems with pretty strict requirements.
2014-03-31 23:50:00 +04:00
Michael Shigorin
1ee5f0561a desktop+razorqt+extra: a few more extras
quiterss is lurking in autoimports so far,
gotta have a look at it...
2014-03-31 23:50:00 +04:00
Michael Shigorin
d9e591a953 regular.mk: man-whatis available within sysv-tde
As proposed by Speccyfighter:

http://lists.altlinux.org/pipermail/community/2014-March/681897.html

...but not installed by default due to overhead:

http://bugzilla.altlinux.org/21838
2014-03-31 23:49:59 +04:00
Michael Shigorin
067b4d1cfb regular.mk: use gdm2.20 for sysv-gtk based images
It has dawned on me that gdm2.20 is more widely useful
within sysvinit based builds: lightdm with gtk greeter
would fail to poweroff/reboot while this one would not.
2014-03-31 23:49:42 +04:00
Michael Shigorin
8419175c02 syslinux: help git grep *_size
It's not exactly obvious how install2_size, live_size or rescue_size
get defined since the variable names themselves get constructed;
help git grep these down.
2014-03-31 23:45:43 +04:00
Michael Shigorin
add424fe76 server: ensure ACPI poweroff support
acpid is not enough since power button handling configuration
has been split apart; and tracking this in zillion places is
utterly useless in face of a specially trained power feature.

Just use it.
2014-03-31 23:45:41 +04:00
Michael Shigorin
b3a91c4895 x11: use/firmware for 3D acceleration
At least Radeon drivers badly need those,
e.g. SUMO_uvd.bin + PALM_pfp.bin for C60 APU.

Helps live-flightgear.iso a lot indeed!
2014-03-31 23:45:19 +04:00
Michael Shigorin
2abee7d82c t7.mk: added altlinux-t7-gnustep-systemd.iso
Another bridgelet.
2014-03-31 23:44:23 +04:00
Michael Shigorin
07779c625b regular.mk: added regular-gnustep-systemd.iso
aen@ asked to ship this one as well; no problem given mixins,
still being able to *switch* the init instead of regrafting
would be very beneficial.

NB:
- wdm can't do autologin;
- wdm can poweroff/halt;
- wdm+autologin won't work under systemd (via prefdm.service);
- nodm will work under systemd;
- nodm will ruin consolehelper -> livecd-install by root's PATH;
- gdm2.20 is lightweight, feature complete and sovereign enough.
2014-03-26 21:01:18 +04:00
Michael Shigorin
a4b4aeb6da x11-autologin: added some warnings to README
nodm needs fixing indeed but let's spell this clearly at least.
2014-03-25 14:51:42 +04:00
Michael Shigorin
d4d16d62cf gear-store-tags 2014-03-24 23:59:05 +04:00
Michael Shigorin
445c361a15 1.1.28-alt1
- install2: more cleanups
2014-03-24 22:20:35 +04:00
Michael Shigorin
c9ca03ffee regular.mk: go on vnc-free with sysv-tde
The reason for an explicit cleanup is that VNC installation support
is now left in by default (see #29901); thus this commit is only
keeping the status quo for this image.
2014-03-24 22:20:28 +04:00
Michael Shigorin
d9d09c72d2 systemd: drop the obsolete feature
This one is really not needed, use/init/* instead.
Been declared obsolete for more than 9 months.
2014-03-24 22:11:42 +04:00
Michael Shigorin
c7e4f5e330 desktop+gnustep*: current updates
A few more tweaks for changes in sisyphus and t7 repos;
thanks real@ for both fixing and tracking things.
2014-03-24 21:56:29 +04:00
Michael Shigorin
9a05187e16 repo: minor important remark
Installation finishes just fine if bzip2-compressed
hash files are removed *but* apt-cdrom add will fail.
2014-03-24 21:56:29 +04:00
Michael Shigorin
b4b9f26cd8 http-server: no more php5-eaccelerator
It's missing in Sisyphus since php5 update to 5.5.x;
while an opcode cache would be a powerful boost for
many webapps this has to be sorted out in repos first.
2014-03-24 21:56:29 +04:00
Michael Shigorin
adffe4a6c3 install2: drop /usr/include
It happens to hold couple of files nowadays
on an otherwise almost empty system!
2014-03-24 21:56:29 +04:00
Michael Shigorin
a2bcf16823 regular.mk: strip jeos further down
It's still a GUI installer but pretty much barebone one by now...
in particular, it needs no xorg-drv-$hardware being mostly targeted
at VMs and demo appliances where fbdev is rather enough.

Cleanup extra kernel drivers too.
2014-03-24 21:56:29 +04:00
Michael Shigorin
148c477c5b install2: introduce tunable kernel driver cleanup
This one has been missing for quite some time (infiniband modules
should have triggered a commit like this back then), finally there
in very crude and draft form for the starters.
2014-03-24 21:56:29 +04:00
Michael Shigorin
1e65a52c5e install2: cleanup everything too
This destructive target is like a "people's revolution":
almost nothing left.

Some need this to achieve jeos or chaos, respectively.
2014-03-24 21:56:29 +04:00
Michael Shigorin
9efac39013 install2: deduplicate removals
{lib,}bind shouldn't have to be removed twice, really.
2014-03-24 21:56:29 +04:00
Michael Shigorin
77a97594a5 install2: font utils have done their duty
By the time these hooks run the font packages' %post scriptlets
should have fired already; no need to carry the utilities on.

Yes these are bit-by-bit savings.  No it's too expensive still.
2014-03-24 21:56:29 +04:00
Michael Shigorin
48239f73e8 install2: drop wayland, EGL
Both might be useful in some context but serve no real need
given the installer one, at least this year.
2014-03-24 21:56:29 +04:00
Michael Shigorin
86ad2dec82 install2: cpp dependencies can go too
This rotten cherry-picking is ridiculous of course
but that's the price to pay for hard dependencies...
2014-03-24 21:56:27 +04:00
Michael Shigorin
ed67687d32 install2: drop common-licenses as well
These aren't going to be really needed in that environment,
please refer to the more complete environments like rescue,
live, or an installed system.
2014-03-24 21:55:55 +04:00
Michael Shigorin
9597b7471c install2: more cleanups
xterm is pulled in by xinitrc (as xvt),
xdg-utils by alterator-browser-qt (for xdg-open).
2014-03-24 21:55:55 +04:00
Michael Shigorin
db85d65b7d install2: sometimes we don't run xorg on hardware
...or are fine with fbdev like in case of installers,
especially minimalistic ones.
2014-03-24 21:55:54 +04:00
Michael Shigorin
3927ac2198 install2: more locale cleanups
My gut feeling is that we're not going to see glib2's
messages a lot within installer environment anyways.

And there's a forgotten /usr/share/X11/locale/ too.
2014-03-24 21:55:30 +04:00
Michael Shigorin
d871db1639 install2: drop lib{cloog-,}isl
These are required by no package after the intermediate
cleanup has finished.  Argh.
2014-03-24 21:55:12 +04:00
Michael Shigorin
5d8af5b77d install2: a tiny but useless directory
Installer doesn't do systemd and needs no service files.
2014-03-24 21:55:04 +04:00
Michael Shigorin
0ba5ad6486 install2: further reduce X driver bloat
An installer needs video playback acceleration
when it has some content to show and some means to;
as long as these are not supported just drop this
unconditionally.
2014-03-24 21:54:46 +04:00
Michael Shigorin
6a59475dbd server.mk: more cleanups
server-nano is intended to be slim; it doesn't need VNC
installation support and provides no LUKS tools either.
2014-03-24 21:54:46 +04:00
Michael Shigorin
e75d647b70 install2: potentially cleanup crypto bits as well
These are only needed for alterator-vm when making
LUKS encrypted partitions; ideally the extra libraries
would be omitted automatically when luks isn't included.
2014-03-24 21:54:46 +04:00
Michael Shigorin
791a236a70 install2: make vnc cleanup conditional
At least don't purge it with no questions answered.
Thanks naf@ for posting #29901.
2014-03-24 21:54:46 +04:00
Michael Shigorin
d587fa5f88 conf.d: updated README to mention mixin/*
The mixin concept and name has been borrowed from Ruby
language -- it's a kind of thing that can be added to
more or less whatever suitable; the problem it tries
to solve is that incrementally building up the image
configuration breaks when one would like to change
something that's been configured in early enough so that
grafting early will warrant a lot of duplication later on
but inheriting too much things that need to be changed
gets too much hackery in.

It started while trying to build an installer image
using configuration bits and pieces collected while
bringing an installable LiveCD together: there are
just too many livecdish things in a LiveCD to try
and rebase the actual desktop configuration things
onto an installer, so putting these into a mixin
to be reused within both livecd and installer
seems the way to go.
2014-03-24 21:54:46 +04:00
Michael Shigorin
0bafa6a69c x11: pull xorg-drv-ati in explicitly
Looks like today's xorg won't autoload radeon_drv but
insists on ati_drv falling back to fbdev if it's not there;
FlightGear runs definitely slow on C-60 APU with that.

I didn't specify ati since it pulls r128 and mach64 modules in
which are rather useless in this context (accelerated 3D graphics).
2014-03-24 21:54:45 +04:00
Michael Shigorin
d868071002 desktop+gnustep: minor tweaks during ongoing testing
Burn.app won't list a USB DVDRW drive with CD-RW inside
(NOT_FOUND), and its README states explicitly that wodim
is not supported yet.

Mixer.app would start with three knobs none of which would
actually change any mixer channel.
2014-03-20 21:36:31 +04:00
Gleb Fotengauer-Malinovskiy
e177121ddf tar2vm: use UUID, prepare for virtio as well
Forward-port of b84182c5cb
commit extended to handle /boot as well.
2014-03-20 19:46:53 +04:00
Michael Shigorin
b0df203272 live.mk: redone live-flightgear
This time it autostarts using livecd-fgfs and primus
if possible; firefox and GUI mixer are the notable loss
but the clarity of "boot into FlightGear" should sort of
compensate for that.

Ah, and Tu-154 by default.
2014-03-20 01:43:54 +04:00
Michael Shigorin
cdaaee4e97 efi: +efi is now signed
That reflects the packaging and distribution practice
having formed during last year or so...
2014-03-20 01:07:19 +04:00
Michael Shigorin
fd8f375573 regular.mk: use imagewriter
Looks like Qt4-based imagewriter fits these images better
than Qt5-based rosa-imagewriter; so be it.
2014-03-19 19:51:32 +04:00
Michael Shigorin
d18dfcd3dc desktop+gnustep: a few more lazy packages dropped
Some of the wares wouldn't actually work on closer examination,
better leave these out for now.
2014-03-19 19:48:51 +04:00
Michael Shigorin
68bb8eb69b desktop+gnustep+etoile: some packages won't work yet
Some apps won't start and some don't have any visible effect.
Let's postpone these.
2014-03-19 18:46:47 +04:00
Michael Shigorin
c647258aab kde4 pkglists: replaced NM applet
plasma-applet-networkmanager is suddenly no more in Sisyphus,
had to replace with kde4-plasma-nm and force gtk applet away.
2014-03-19 12:11:04 +04:00
Michael Shigorin
962e021cca desktop+gnustep: list cleanup
Some of the packages have been identified as abandoned
and were purged; some of those with problems have been
reportedly fixed since.

See also:
http://altlinux.org/?title=Talk:GNUstep/Applications&diff=28911&oldid=28730
2014-03-19 01:44:52 +04:00
Michael Shigorin
da8b4765b7 regular.mk: cinnamon to use un-def
Current Sisyphus' xorg-drv-intel works somewhat better
with recent kernel drivers on my HD4000 GPU, and icewm
is not compositing at all; providing another test/backup
image fitted with newer kernel should do no harm.
2014-03-19 01:15:12 +04:00
Michael Shigorin
2155b2602a desktop+gnustep+etoile: a few more Etoile packages
Thanks real@ and kostyalamer for packaging these
along with new and shiny menufiles; a new pkglist
seems reasonable by now.
2014-03-19 01:14:26 +04:00
Michael Shigorin
3eab800508 regular.mk: added rosa-imagewriter to kde4 flavour
This package has been built and recommended by cas@;
it requires Qt5 which hasn't been needed for anything else
included in regular builds so far so let's extend kde4 one
to begin with.
2014-03-18 23:46:56 +04:00
Michael Shigorin
b56387978b regular.mk: add regular-server-un-def
For lewellyn@freenode and his Hyper-V Generation 2 VM,
regular-rescue happens to boot there.
2014-03-18 21:12:21 +04:00
Michael Shigorin
1aad0bc5f9 regular.mk: use plain autologin for wmaker
lightdm isn't going to turn off the system properly
with no systemd-logind around ("for no good reason",
that is); good ol' wdm for installed system and the
similarly ol' autologin just work though.

nodm is not gonna cut it since user PATH is weird
within the session breaking livecd-install by putting
/usr/sbin before /usr/bin while it shouldn't be there
in the first place.
2014-03-18 20:51:47 +04:00
Michael Shigorin
fe56fda2f3 x11-autologin: added a few notes
Looks like nodm doesn't reset the PATH set within
/etc/rc.d/init.d/functions which results in sbin
path components hitting user's PATH; livecd-install
which uses consolehelper was what broke first for me.

And this link should illustrate some of the problems
tackled by this kind of scripts...
2014-03-18 20:43:15 +04:00
Michael Shigorin
922a2759b0 server: set default syslinux timeout to 60 sec
Servers can POST much longer so having to play hide and seek
with a boot menu isn't going to be exactly entertaining;
let's bump the delay to something comparable at least.

Thanks hiddenman@ for mentioning the obvious-but-unnoticed.
2014-03-18 18:46:21 +04:00
Michael Shigorin
2d2d6ac649 regular.mk: luks to the rescue
Don't remember why this hasn't been there already;
looks like a worthwile addition though.
2014-03-18 17:51:27 +04:00
Michael Shigorin
187d3dedf2 regular.mk: explicitly add NM to a few images
As it happens regular-rc testing has shown that cinnamon,
gnome3 and kde4 flavours included NM via their pkglists
and dependencies (which used to result in live feature
enabling NetworkManager service wholesale when found);
now when handling default services has become more strict
it became apparent that these images have got their LiveCD
mode running without network by default (installation does
set that up though).

It looks like an easy way to just stick +nm into .regular-desktop
dependencies but then razorqt, sugar, xmonad would get NM which
is not what they're gonna handle; e17/e18 too.
2014-03-18 13:57:40 +04:00
Michael Shigorin
719144f6c3 gear-store-tags 2014-03-17 21:25:11 +04:00
Michael Shigorin
784e7444d8 1.1.27-alt1
- don't insist on k-m-r8168
- codebase deduplication
2014-03-17 21:23:23 +04:00
Michael Shigorin
71b5d53919 QUICKSTART: mention ~/tmp
This has to be present with default RPM macros, otherwise:

  rpmdb: /home/altlinux/tmp: No such file or directory
  rpmdb: unable to create temporary backing file

See also http://bugzilla.altlinux.org/26514
2014-03-17 21:23:21 +04:00
Michael Shigorin
53f05f46a8 live: put rpcbind to local-only mode by default
We don't really want to disable NFS portmapper completely
but having some extra root code listening to the world is
really unneccessary unless explicitly required.

Applying "control rpcbind local", thanks ldv@ for advice.
2014-03-17 21:22:45 +04:00
Michael Shigorin
5d829265db live, net: shift and rework network and resolver setup
50-setup-network was a hasty hack (surprise!) that used to do
what net and net-eth features have been created to do since;
just drop the duplicated crufty code.

Unconditional resolver setup isn't done now: those with static
setup are better off doing it explicitly, and those with DHCP
should be fine already.

NB: /etc/hosts *is* fine within setup package *but* hasher will
    overwrite it with a copy of host's one; let's reset contents
    to initial at least until hasher gets fixed and the fix is
    rather deployed in the wild.
2014-03-17 21:22:29 +04:00
Michael Shigorin
75bf4afcaa live: use/services instead of homemade script hook
03-services was a hasty hack that has been long done properly
elsewhere, namely in a specialized feature; finally got around
to deduplicate it out.
2014-03-17 21:22:29 +04:00
Michael Shigorin
7fafe134c6 net-eth: drop duplicate config line
There was an extra DISABLED=no line written to interface configurarion
that's been superceded by the subsequently added parametrized one;
just drop it.

Thanks glebfm@ for spotting the garbage.
2014-03-17 21:22:29 +04:00
Michael Shigorin
5de5da1d55 regular.mk: rescue should use branding
Well actually it shouldn't -- except for rEFInd the boot manager:
branding graphics within the build environment are used to add
a single background image to EFI/refind/icons/ thus the change.

Wonder how this got lost though as this screenshot:
http://en.altlinux.org/File:Altlinux-rescue-uefi-memtest86.jpg
clearly illustrates it was working back in December indeed!
2014-03-17 21:22:29 +04:00
Michael Shigorin
49b6291a40 kernel, stage1: don't provide r8168.ko by default
It conflicts with r8169.ko inobviously.

The whole mess looks like this:
- r8169.ko doesn't work for all of Realtek 8111/8168/8169 mutations
- r8168.ko works with some of the chips r8169.ko doesn't
- r8168.ko also works with many chips r8169.ko works with
- r8169.ko is provided by kernel-image package (thus default)
- r8168.ko is provided by kernel-modules-r8168 package (optional)
- kernel-modules-r8168 package requires r8168-blacklist package
- r8168-blacklist package is a one-liner that blacklists r8169.ko
- STAGE1_KMODULES wouldn't include r8168 (std-def) or rtl8168 (led-ws)
- sub.in/stage1/modules would mention r8168.ko (m-p-d: r8169.ko)

So a LiveCD built with use/kernel/net might work with RTL8111/8110
just fine when booted live but fail to automatically load the module
when installed onto hard drive; manual modprobe r8169 would work though.
NB: some of the chips (those available to me) would work just fine
both ways -- this has contributed to fixing this *that* late.

Bottom line:

  do not install backup/kludge drivers overriding main ones by default!

Thanks sem@ for providing the crucial hint.
2014-03-17 21:22:29 +04:00
Gleb Fotengauer-Malinovskiy
febe4fc81b repo: armh doesn't have noarch
This is about (a)synchronous package builder in fact.
2014-03-17 21:22:28 +04:00
Michael Shigorin
e07bfea21c gear-store-tags 2014-03-10 22:53:25 +04:00
Michael Shigorin
d53a1d4192 1.1.26-alt1
- docs week
- deflogin: empty ROOTPW explicitly ignored (potential security fix)
2014-03-10 22:47:55 +04:00
Michael Shigorin
a165928959 fdisk is rather "base" than "extra" tool
That's how it evaded the rescue part of regular-sysv-tde.
2014-03-10 22:40:19 +04:00
Michael Shigorin
afa1e2db50 regular.mk: tweaked .regular-sysv-gtk
Looking as how every .regular-sysv-gtk descendant ended up using
use/syslinux/ui/gfxboot by now it seems better to just stick it there.
2014-03-10 22:29:37 +04:00
Michael Shigorin
f2892ad3e4 deflogin: GLOBAL_ROOTPW is always set
use/deflogin will result in ROOTPW being exported no matter
is it set or not; xport() can't check before exporting as it
relies on lazy evaluation when the actual ROOTPW value can be
set or modified after exporting GLOBAL_ROOTPW for mkimage.

So let's not even pretent we can differ unset ROOTPW from
empty ROOTPW: both result in empty GLOBAL_ROOTPW as of today.

Fixing this would require moving the exports into a separate
makefile being included after all the configuration and checking
each variable for being defined before exporting the corresponding
GLOBAL_ prefixed one.

Yes this might be a security fix in some cases.
2014-03-10 22:29:37 +04:00
Michael Shigorin
e00d46cf97 regular.mk: added regular-e18-sysv.iso
It's preliminary but rather working by now;
one of the main woes is #29497 so far.

xterm has been overduplicated,
moved to pkglists for clarity.
2014-03-10 22:29:37 +04:00
Michael Shigorin
ecc5039c29 regular.mk: once-only slideshow for sysv-tde
TDE images are pretty modest regarding resource consumption
thus suitable for older hardware; a slower flash drive can
stall indefinitely showing slideshow and not going any further
with actual package installation so let's put a cap on that.
2014-03-10 22:29:36 +04:00
Michael Shigorin
c104131057 branding: added slideshow knobs
Added use/branding/slideshow/once as one of the uses
albeit the interface is universal; see this page for
more info: http://altlinux.org/branding/slideshow [ru]
2014-03-10 22:29:35 +04:00
Michael Shigorin
039af304d0 net: fix a thinko (it's connmand)
The service and initscript have "connmand" name
while the package is called "connman" indeed.

Shame on me; this became apparent
while building regular-e18-sysv.
2014-03-10 22:28:27 +04:00
Michael Shigorin
93614040c7 regular.mk: use openntpd instead of ntpd
Speccyfighter asked for NTP support within sysv-tde flavour;
meant openntpd apparently, fixing up.
2014-03-10 22:28:27 +04:00
Michael Shigorin
0ae7f37900 desktop+gnustep: initial Etoile project packages
gnustep-AddressManager has been replaced
with gnustep-Etoile-AddressManager, ditto
gnustep-DictionaryReader; see also [ru]:

http://altlinux.org/?title=GNUstep%2FApplications&action=historysubmit&diff=28795&oldid=28694
2014-03-10 22:28:27 +04:00
Michael Shigorin
5360992190 deflogin: minor tweaks
Defining a one-time variable is useless in this case,
and README should state the undefined ROOTPW status
explicitly (since it's now as advertized, heh).
2014-03-10 22:28:27 +04:00
Michael Shigorin
0fcb491500 mkimage-profiles.asciidoc: tac the goals
The goals listed are pretty important to have them ordered
by priority; collaboration is definitely more important
than dynamic range of release managers' experience.
2014-03-06 00:35:10 +04:00
Michael Shigorin
2aece7c6ec p/l/t/README: updates and tweaks
Some more editing has been due over pkg.in/lists/tagged/README
to make it more comprehensible and up-to-date; the problem with
groups isn't actually that bad as alterator-pkg's groups concept
is currently aligned with the requisite functionality provided by
pkg.in/lists/* directly; the tagged pkglists come into play when
we want to add "something like that" and don't really care about
the fine details of a secondary thing trusting that it's actually
comprised and working as advertized through its name tags.

Compare to reusing the pre-existing image configuration or features
versus reimplementing things in a rigid manner -- it's a flexibility
vs predictability question, and both scenarios are supported within
m-p explicitly.
2014-03-05 21:36:30 +04:00
Michael Shigorin
3f547e2504 documentation: use paths relative to toplevel dir
This change is done to reduce ambiguity in some cases;
the previous intention has been to ease navigation when
staying in a particular directory, now it's been changed
in favour of convenient toplevel `git grep' in fact.

Both variants have their pros and cons, I just find myself
leaning to this one by now hence the commit.  Feel free to
provide constructive criticism :)

Some path-related bitrot has also been fixed while at that.
2014-03-05 21:36:30 +04:00
Michael Shigorin
4fff399b35 README: minor tweaks
A few readability fixes and lib/*.mk demotion since conf.d/*.mk
is now an established place for RM-written image configuration.
2014-03-05 17:55:25 +04:00
Michael Shigorin
f30fb765b6 mkimage-profiles.asciidoc: change example target
icewm.iso is an installer needing further hassle to try;
rescue.iso is immediately useful OTOH.
2014-03-05 17:55:25 +04:00
Michael Shigorin
364488e588 mkimage-profiles.asciidoc: fix formatting
"Goals" paragraph ended up with all of list items on a single line;
a colon has been missing in another one.
2014-03-05 17:55:25 +04:00
Michael Shigorin
4ea06fed33 sub.in/README: bitrot fixup
sub/% has moved from lib/distro.mk to lib/sugar.mk
since rootfs introduction with commit g67adab4.
2014-03-05 17:55:21 +04:00
Michael Shigorin
1a25a7052d sub.in/README: mention rootfs
Its name might still change through 1.1.x series
("userfs"?) but things like this should be mentioned
at least -- or superfluous references to neighbouring
entities should be removed.
2014-03-05 16:34:42 +04:00
Michael Shigorin
b0d6476f41 rescue: disable rpcbind
It's required for NFS mounts but having a rescue image listening
to any non-localhost ports is too bad an idea, IMNSHO.

So let's fix this while spotted.
2014-03-05 13:15:08 +04:00
Michael Shigorin
e590862470 desktop+razorqt: dropped psi-plus-plugin-gmailnotify
It's missing as of psi-plus-0.16.289-alt1.
2014-03-04 10:32:07 +04:00
Michael Shigorin
5cc11a6646 t7.mk: initial release
Well, some of the maintainers clearly prefer t7/branch
to publish their works; at least GNUstep and TDE packages
are updated there and might migrate to p7/branch later.

No need to fight that, really.
2014-03-04 00:34:50 +04:00
Michael Shigorin
14976fa864 gear-store-tags 2014-03-04 00:01:15 +04:00
Michael Shigorin
d64ed13dc5 1.1.25-alt1
- regular updates
2014-03-03 22:26:23 +04:00
Michael Shigorin
161f7ccd03 desktop+gnustep: app status update
Split development packages into dev+gnustep pkglist -- these are
worth including in "full" version but will need thorough testing
so as to present the tools to those who value these.

Some of user packages are problematic and shouldn't be included
right now; the problems are mostly of these kinds:

- app won't start (at all or effectively);
- useless for being too alpha quality/incomplete;
- menu file for a commandline app lacking any feedback;
- package lacks the dependencies needed;
- it's a LoginPanel ;-)

Thanks a lot to upstream authors, real@ the packager
and kostyalamer who prepared a lot of menufiles anyways!
2014-03-03 22:24:34 +04:00
Michael Shigorin
9e162659a4 tar2fs: append to MODULES_PRELOAD, do not clobber
Thanks glebfm@ for spotting that it's = instead of +=
as it goes in all the other places; I remember no good
reason to overwrite the potentially preexisting contents.
2014-03-03 19:56:09 +04:00
Michael Shigorin
8040bb5dae regular.mk: extend virtual guest support in jeos
KVM and VirtualBox support packages are pretty tiny
but essential when these images get deployed within
virtual environments for any reason, let's add 'em.
2014-03-01 23:41:33 +04:00
Michael Shigorin
57d7ad149a regular.mk: add gfxboot to icewm :(
It's been gfxboot-free but no user visible facility to select locale
has emerged through these years; it's been decided to put gfxboot
until some text chooser is available (thanks aen@ for discussion).
2014-03-01 23:30:28 +04:00
Michael Shigorin
fbc6c2ff78 regular.mk: several more packages added to sysv-tde
These have been requested by Speccyfighter:
http://lists.altlinux.org/pipermail/community/2014-February/681710.html
2014-03-01 23:30:26 +04:00
Michael Shigorin
b7e824b742 vm.mk: use sysvinit
I don't see any reason to use systemd within VM images,
and it would stick its journal as a syslog implementation
when not ditched explicitly :-/
2014-03-01 23:30:01 +04:00
Michael Shigorin
6ed7da1e49 p7.mk: added vm/net alias
vm/altlinux-p7-vm-net is yet another bridge...
2014-03-01 23:30:01 +04:00
Michael Shigorin
863fa04957 vm.mk: vm/net should use/repo
IOW one has every right to expect that package manager
is set up already in a networked virtual machine.
2014-03-01 23:30:01 +04:00
Michael Shigorin
5b05b64ba1 desktop+gnustep: wholesale facelift
This has been prepared by real@ and kostyalamer,
thanks them both; still needs more QA though.
2014-03-01 23:30:01 +04:00
Michael Shigorin
d778e6e794 p7.mk: tweak VE template cache name
Renamed ve/altlinux-p7 to ve/altlinux-p7-ovz-generic for clarity.
2014-03-01 23:29:59 +04:00
Michael Shigorin
0be43b57af regular.mk: initial regular-jeos
This is a minimalistic ALT-based system installer tailored
for those who know how to bring up networking and apt-get
the packages they actually need; thanks frbrgeorge@ for
proposing the specification as well as sem@ and glebfm@
for discussion.

No mc, no glibc-locales, even no man and interactivesystem!
Packages included: apt basesystem openssh vim-console

PS: Sisyphus-based regular build is not the main goal though
thus the p7/branch {bri,klu}dge.
2014-03-01 23:27:29 +04:00
Michael Shigorin
8017b0886d regular.mk: deduplicate use/install2/fs
We want every regular installer to know more than ext4 apparently.
2014-02-26 17:32:24 +04:00
Michael Shigorin
4ed4f324ab regular.mk, p7.mk: added server-ovz
This image is largely a rebase of server-ovz.iso onto regular-server;
it's not feasible to provide a single image that would install either
"mini" server or openvz/kvm one based on user choice during boot alas
(even if both ovz-el and std-def kernels are provided within "ovz" ISO
and vzctl&co could be stuffed into a package list/group).

Maybe this is fixed some day...
2014-02-26 15:38:50 +04:00
Michael Shigorin
0da7ae547c server: generalize server-ovz configuration bits
OpenVZ related part is now a reusable use/server/ovz target,
and service related groups which have been largely taken from
rider@'s server-light project are now use/server/groups/base.
2014-02-26 15:37:05 +04:00
Michael Shigorin
31084651f7 gear-store-tags 2014-02-10 22:09:42 +02:00
Michael Shigorin
25b983f877 1.1.24-alt1
- service bridge
2014-02-10 22:09:15 +02:00
Michael Shigorin
7ebb297235 live.mk: FG needs network too
TerraSync might come handy (just as online manuals) but one's
going to need internet access for that so let's put at least
DHCP-over-Ethernet configuration preset in.
2014-02-10 02:29:30 +04:00
Michael Shigorin
86d213cd5a live.mk: added Tu-154 aircraft model to FG image
There's a beautiful airliner model out there thanks to the guys
at flightgear.ru, and it was asking to be included but its unclear
licensing status; now that 3.0 is GPLed I'm glad to add this package.
2014-02-10 02:26:05 +04:00
Michael Shigorin
9edbd2a2e1 live.mk: FG needs a mixer!
It's been done and taken into regular-icewm already,
and running FlightGear with whispering sound isn't
really immersive.
2014-02-10 02:26:05 +04:00
Michael Shigorin
6b81b8de20 live: tweak usergroups list
"cdrom" is rather obsolete (currently unused), and "xgrp"
is useful (and actually required to use bumblebee package).
2014-02-10 02:26:05 +04:00
Michael Shigorin
54fbf30611 x11: optimus support
The use/x11/nvidia/optimus target will pull the bits required
to operate NVIDIA Optimus GPU scheme which relies on integrated
GPU to actually drive the screen; much thanks to barssc@ for
good walkthrough: http://altlinux.org/optimus

NB: this *will* break if nouveau gets in, YHBW.
2014-02-10 02:26:05 +04:00
Michael Shigorin
6a5b8115a3 live.mk: initial live-glxgears image
This might belong to test.mk actually but it's been instrumental
in getting bumblebee support operational within these LiveCDs;
icewm and sysvinit are a commonplace among those currently
but aren't set in stone for that matter.
2014-02-10 02:25:17 +04:00
Michael Shigorin
d50b3fe247 server: disable dbus, lvmetad
"messagebus" service is autostarted since dbus gets in being required
by wpa_supplicant <- alterator-net-wifi <- alterator-net-eth; it is
really not needed in the minimalistic server, let's just turn it off.

"lvm2-lvmetad" service requires setup to be actually useful (#29474).
2014-02-09 03:01:46 +04:00
Michael Shigorin
f5fd77640a services: pass service status to installer
This is long overdue: services feature influences live
and rescue but doesn't do anything to the installed system
as that's behind the installation barrier; some piggybacking
required to do that has been merged into installer back in
2012 apparently (thanks to boyarsh@ for both doing that and
bringing my attention to this fact; it's 65-setup-services.sh
as of today).

So the only thing missing has been the bridge to prepare
those files -- still some more tweakery is required given the
two-stage process arranged so that reusable configuration could
include some sane defaults but the release manager is ultimately
able to override anything without extra kludges; thank legion@
for his wonderful libshell either.

NB: install2 script is a partial clone of rootfs one since
processing the variables is identical; still rootfs script
has to change service state directly while install2 one
has to deposit the information for installer to handle.
2014-02-09 02:38:16 +04:00
Michael Shigorin
67d60d0031 rescue+extra: whoops, fixed a thinko
I was crazy not to recheck this :-(
2014-02-04 13:55:39 +04:00
Michael Shigorin
7e925008bd gear-store-tags 2014-02-03 23:54:23 +04:00
Michael Shigorin
47c3a86547 1.1.23-alt1
- live, net*, syslinux fixes (see also #26608)
2014-02-03 23:54:04 +04:00
Michael Shigorin
0fb4b58771 live: use lateboot for textinstall
use/live/textinstall target is a base for those images whose
target audience tends to be somewhat more experienced; these
might prefer to just boot off the image instead of having to
perform any extra action like pressing down arrow and enter.

This is also to help msp@'s homeros-*.iso boot immediately.
2014-02-03 23:32:16 +04:00
Michael Shigorin
5f68010ae8 syslinux: add 40lateboot.cfg (_after_ ??live*.cfg)
Actually a copy of 10localboot.cfg with a different name
and sorting order so as to address #26608: there's no possibility
to make a LiveCD image that would boot itself by default if localboot
has been configured in.

It's only a partial solution as it doesn't override 10localboot
in case it's there already but a step in that direction...
2014-02-03 23:29:32 +04:00
Michael Shigorin
2cec43fddc net-eth: update README
A hint regarding livecd-net-eth is due -- as well as
review and cleanup of live, net, net-eth features
involved in configuring that ethernet for a LiveCD.
2014-02-03 23:20:25 +04:00
Michael Shigorin
3e5d01f146 base+pkg: added cpio just in case
This is not strictly required but is basically requisite for some
operations with both packages (did you know about rpm2cpio.sh?)
and initramfs images (which are gzipped cpio archives).

So let's put it in.
2014-02-03 23:20:25 +04:00
Michael Shigorin
cbcb57ca80 live.mk: add UEFI support to live-builder.iso
It's just reasonable given that new hardware tends to have that.
2014-02-03 23:20:25 +04:00
Michael Shigorin
9d7538838c live, net-eth: add DHCP_TIMEOUT when appropriate
It's hardwired at 1/10 of the default /etc/net value
since 3 seconds are enough for properly functioning
DHCP servers in properly maintained networks (those
improper ones tend to have problems with 30 seconds
anyways), and waiting for too long makes users feel
bad for a reason.

Thanks msp@ for bringing attention to this.
2014-02-03 23:20:25 +04:00
Michael Shigorin
4dbd7c40f0 rescue+extra: added idle3ctl
This one is intended for WD Green drives so as to bring
their spindown timeout into some kind of sanity;
see also http://bugs.etersoft.ru/9438
2014-02-03 22:53:43 +04:00
Michael Shigorin
4639e7960d install2: add installer-common-stage3
This package has replaced installer-feature-setup-network-stage3
without declaring that; it appears that installer-distro-altlinux-*
don't require it even if most of the others do.

This is to ensure it's included, at least at the moment.
2014-02-03 22:53:43 +04:00
Michael Shigorin
1e89117464 regular.mk: dropped kdegames from tde mixin
mixin/regular-tde is used in sysv-tde flavour which has hit 700M
limit for CD-R as Speccyfighter has noted; we can do without games
probably, or at least let's try to.

http://lists.altlinux.org/pipermail/community/2014-January/681534.html
2014-02-03 22:53:43 +04:00
Michael Shigorin
7cc8231ed4 regular.mk: regular-sysv-tde tweaks
It lacked base desktop packages indeed; thanks Speccyfighter
for naming rsync and wget (as well as mc).
2014-02-03 22:53:43 +04:00
Michael Shigorin
a0d0be1a71 syslinux: fixed live_rw configuration
The initial revision was brilliantly buggy: it is *so* apparent
that cdrom will never be actually used for rw slice that this
has evaded my attention rather completely.
2014-01-28 21:25:36 +04:00
Michael Shigorin
d20ab96daf gear-store-tags 2014-01-27 23:58:52 +04:00
Michael Shigorin
0385f90637 1.1.22-alt1
- ahci kludge (see #29705) :(
2014-01-27 23:58:26 +04:00
Michael Shigorin
9d495f26cb stage2: preload ahci before udev/propagator
This change tries to force loading the storage driver
for cases when SecureBoot is "helping" the chainloader
to fail, see #29705 for details collected so far.

Of course ahci.ko only does AHCI but that's every storage
controller I've seen on UEFI/SecureBoot systems so far.
2014-01-27 23:56:07 +04:00
Michael Shigorin
17ce5ae96d Revert "regular.mk: gnustep is broken on x86_64 right now"
This reverts commit d160d6100e:
GNUstep reportedly works on x86_64 now.

Conflicts:
	conf.d/regular.mk
2014-01-21 13:13:57 +04:00
Michael Shigorin
18fc7960cb gear-store-tags 2014-01-20 23:31:41 +04:00
Michael Shigorin
c5d543510c 1.1.21-alt1
- rescue tweaks
2014-01-20 23:25:06 +04:00
Michael Shigorin
26cef0ad92 server: add osec support
Let's put osec tools into installable packages at least
(aiming to shift these into default install probably);
these are worthwile addition to sysadmin's toolbox.

Thanks dobr@ for bringing this up.
2014-01-20 14:59:24 +04:00
Michael Shigorin
3879fb002a rescue+extra: add a few more fuses
It turns out that regular-rescue.iso lacks sshfs,
which is unfortunate (even if it could be installed
with apt in this particular case); three more FUSE
based filesystems have been added just in case.

Thanks mithraen@ for suggesting davfs2.
2014-01-20 14:59:24 +04:00
Michael Shigorin
954d89cf9c regular.mk: employ test/rescue/no-x11
I'm fed up with graphical software occasionally making it
into regular-rescue.iso and bloating it for no good reason
given that window managers or xinitrc aren't included.
2014-01-20 14:59:24 +04:00
Michael Shigorin
711ae1ee9e rescue: experimental test to check for libX11
This has been spotted and solved manually several times already,
and that's just boring so let's add the ability to state that
X11-based software is not accepted into a particular rescue image.

Not that I would hate X but things like that belong to a carefully
crafted image which includes either X server or reasonable means
to ensure that GUI software can actually be used.

NB: this is a somewhat new entity: test/rescue/no-x11 knob
for an image-script intended to make it blow up the build
when libX11 is found within the chroot that makes up
the rescue image's filesystem.

The interface is not documented intentionally: it will take
some time to find out whether it sticks or is bad enough.
Please do remind/ask if interested in using that.
2014-01-20 14:57:42 +04:00
Michael Shigorin
e06090a11f base+rescue: move glibc-locales to rescue+extra
It's a pretty hefty addition which isn't strictly required
in a basic rescue image even if it's welcome as an extra.
2014-01-16 17:45:10 +04:00
Michael Shigorin
7c7d74b4d9 tags2lists: skip backup files too
Seeing tagged/base+rescue~ in build.log isn't particularly
heart-warming; while other editors but the one leaving tilda
marked backups and .sw* swap files might exist let's do this
step at this time.

Wonder what changed though, this used not to happen before.
2014-01-16 15:52:12 +04:00
Michael Shigorin
1186a5e7f7 luks: move alterator-luks from pkglist to feature
Rescue images definitely don't need alterator pulled in.
2014-01-16 15:30:22 +04:00
Michael Shigorin
d5f10cbe49 gear-store-tags 2014-01-13 21:35:37 +04:00
Michael Shigorin
24033f6dbe 1.1.20-alt1
- support for CIFS installation method (sin@)
- glibc-locales for regular images (closes: #29693)
2014-01-13 21:34:18 +04:00
Michael Shigorin
ab7d5f218e base+regular: added glibc-locales
At least regular images should include locale support,
various software and users might malfunction otherwise;
thanks manowar@ for spotting and reporting this (#29693):

http://lists.altlinux.org/pipermail/sisyphus/2014-January/361929.html
2014-01-13 21:29:54 +04:00
Michael Shigorin
978984daf1 install2: put filesystem utils into installed system too
It's a tad pointless to be able to create a filesystem
but not to be able to fsck it at boot.
2014-01-13 21:29:54 +04:00
Evgeny Sinelnikov
d385a7864c stage1: add CIFS installation method 2014-01-11 22:51:19 +04:00
Michael Shigorin
531d976f58 gear-store-tags 2013-12-30 20:34:59 +02:00
Michael Shigorin
e4636b8345 1.1.19-alt1
- regular fixes
2013-12-30 20:34:14 +02:00
Michael Shigorin
c89ac47af3 regular.mk: added aptitude to server image
Dank Bagryantsev asked if it could be added to available packages
at least; well it is there now but not in default install
as aptitude is currently unsupported.
2013-12-30 20:34:14 +02:00
Michael Shigorin
9b8da4087b rescue, server, regular: added pciutils
At least lspci was sorely missing in non-rescue images
(as well as in mini rescue part of server image);
thanks Dank Bagryantsev for pointing this out:
http://lists.altlinux.org/pipermail/community/2013-December/681223.html
2013-12-30 20:34:14 +02:00
Michael Shigorin
e87593b596 QUICKSTART: refer to mkimage-preinstall
Thanks ksa at Russia-2 forum:
http://forum.russ2.com/index.php?showtopic=3784&st=0&p=37927&#entry37927
2013-12-27 23:58:53 +02:00
Michael Shigorin
2d4061fc6e regular.mk: added rescue image to regular-server
This is pretty valuable addition and doesn't take that much space
(roughly +100M).
2013-12-25 12:38:22 +02:00
Michael Shigorin
6d95f8c370 branding, plymouth: rescue is stage2 too
I don't think we're gonna like plymouth over rescue image
anytime soon, especially when it hides the moment when shell
pops up somewhere under it without startup-rescue caring to
remove the splash.

So let's put that $(INSTALL2_BRANDING) into proper stage2
flavours only and avoid choking on missing plymouth as well.
2013-12-25 02:36:48 +02:00
Michael Shigorin
f044f58775 install2, sound, vmguest: support led-ws modules
led@ has different kernel-modules-* package set,
some of those "standard" names are provided but
vbox* is not the case.

As our macros and helpers will grok this just fine,
let's add both variants so what's present gets in.
2013-12-25 02:21:00 +02:00
Michael Shigorin
8cc33c105a regular.mk: add vmguest support to graphical installers
Another fork place: live branch used to depend on +vmguest,
installable one omitted that for some reason.
2013-12-25 02:21:00 +02:00
Michael Shigorin
6617b1a1b7 regular.mk: beef up sysv-tde a bit
Suddenly got lots of extra space to wa^H^Hfill due to led-ws
thus a few more FRs by Speccyfighter can go in ;-)
2013-12-25 02:21:00 +02:00
Michael Shigorin
0bfbdcb3e0 regular.mk: move sysv-tde to led-ws
This kernel can help save almost 50 megabytes of image size
and shave off several megs of RAM consumption as well which
is important after the installation has been through.
2013-12-25 00:01:34 +02:00
Michael Shigorin
faae2165de regular.mk: sysv-tde += rescue, efi-shell
Adding rescue image was requested by Speccyfighter (in Russian):

http://lists.altlinux.org/pipermail/community/2013-December/681045.html

...and it seems hard but doable if one doesn't mind barebone rescue;
still efi-shell shouldn't spoil x86_64 build as that one won't fit CD-R
and doesn't have to anyways.
2013-12-25 00:01:34 +02:00
Michael Shigorin
38152b0f59 rescue: added euro variant (a crisis one)
In these tough times there are no extra resources to waste
for wars or some extra rescue; so it is imperative to provide
some lean and mean help, you know.

IOW a common base has been split out and a more tight rescue
image configuration has been added on top of that so as to
try and fit altlinux-p7-sysv-tde.iso for i586 into CD-R.
2013-12-25 00:01:34 +02:00
Michael Shigorin
b8cccbefe9 desktop+regular: dropped alterator-nsswitch
Argh, so alterator-auth was hiding under a name it provides too
-- now *that* is the cause for those last-step failures as the
rest of the environment hasn't been getting set up apparently.

Just drop it, there's a proper domain-client pkglist for that.
This is what 63293ff22a should
have done too.
2013-12-25 00:01:34 +02:00
Michael Shigorin
1bce465aa4 base+live: renamed to base+desktop+live
...so that it hits regular-sysv-tde (and other installers) too.
2013-12-24 23:20:51 +02:00
Michael Shigorin
300295da23 regular.mk: use various kernels again
un-def got unsuitable due to initial ramdisk migrating from
initramfs to tmpfs by default in newer kernels, and propagator
was using pretty kludgy way to determine that /dev has been
mounted already; led-ws (and supposedly lks-wks) have stumbled
upon this earlier.

20130822 version has been fixed regarding that.
2013-12-24 23:19:01 +02:00
Michael Shigorin
596a6bfe3d efi: whoops, non-x86_64 got broken
I've noted that this bit of code should be fixed up
before pushing but managed to overlook that in the end :(

mkimage version bump is due to the somewhat changed layout
of EFI packages and binaries within those (linked message in Russian):
http://lists.altlinux.org/pipermail/devel-distro/2013-December/001283.html
2013-12-24 11:54:01 +02:00
Michael Shigorin
c4a6bab55c gear-store-tags 2013-12-23 21:33:03 +02:00
Michael Shigorin
6929adbcf3 1.1.18-alt1
- efi updates
2013-12-23 21:28:31 +02:00
Michael Shigorin
e6d41a6f1c regular.mk: use installer-distro-altlinux-desktop
...instead of installer-distro-desktop which pulls in
alterator-auth which breaks things big time for sysv-tde
installer image due to avahi-daemon lazy to run.

Of course it's the last step of installation that has to fail.

And I've been considering this for several months already anyways.
2013-12-23 20:49:15 +02:00
Michael Shigorin
18ae053e93 desktop+e17+e18+extra: include "e18"
I wondered how regular-e18 lacked econnman but it only
took a closer look to understand that it's just not told
to go in, plain and simple!

There are no e18-extra-modules (at least so far),
confine that to desktop+e17.
2013-12-23 20:48:31 +02:00
Michael Shigorin
bbc9ee359a regular+kde4: added quick-usb-formatter
Thanks zerg@, it's been one of the things asked for.
Should end up in kde4-regular dependencies if OK.
2013-12-19 16:44:41 +04:00
Michael Shigorin
893e71a9db desktop+regular: added synaptics setup for tap clicks
Thanks sem@ for implementing and announcing wrt Simply 7.0.2.
2013-12-19 03:23:17 +04:00
Michael Shigorin
129e40395a efi: add pesign to the rescue
It's at least as worthy as sbsigntools are.
2013-12-19 03:11:11 +04:00
Michael Shigorin
56f30e72b0 regular.mk: use/efi/memtest86 for regular-rescue
It's proprietary now but still very useful with no free software
alternatives for UEFI platform so far; let's include efi-memtest86
into the rescue image at least.
2013-12-19 03:11:11 +04:00
Michael Shigorin
83b17d2982 efi: add use/efi/memtest86
It's implemented just like EFI_SHELL and will definitely
change someday but so far it's like this...
2013-12-19 03:11:11 +04:00
Michael Shigorin
90429a8508 efi: drop -signed subpackages
We chose to provide methods to sign packages but to avoid
signing these by default (with some arbitrary test keys)
the signatures are being added *after* the build by means
of rpmrebuild-pesign; all of this is made significantly
more complicated if there are separate -signed subpackages.

So these are being dropped in the packages; account for that.
2013-12-17 15:48:59 +02:00
Michael Shigorin
ed5367cb89 gear-store-tags 2013-12-16 23:41:29 +02:00
Michael Shigorin
55819f0577 1.1.17-alt1
- refind branding
2013-12-16 23:39:28 +02:00
Michael Shigorin
e4bb17279d branding: support refind branding
Everything is handled within mki-copy-efiboot currently
but it needs an image to process; extracting one from
bootloader branding seems less hassle than forcing it
into every flavour of branding.
2013-12-13 21:26:45 +04:00
Michael Shigorin
3ee4109b3e rescue+misc: added two more deduplication utilities
My personal favourite one is hardlinkpy currently
(thanks ldv@) but a few others might be handy as well.
2013-12-11 16:45:50 +04:00
Michael Shigorin
4c37fec82c rescue+backup: dropped duplicity
I've managed to overlook that it pulls in libX*...
2013-12-11 16:36:13 +04:00
Michael Shigorin
365c914a29 rescue: added rescue+fs pkglist
The changes in commits gb3e3234 and ga860b17 were actually useless
as rescue+fs list wasn't included into RESCUE_LISTS... and I need
pv(1) for convenient local disk cloning with time estimate.
2013-12-10 18:23:56 +04:00
Michael Shigorin
05cb913baa gear-store-tags 2013-12-09 22:53:24 +04:00
Michael Shigorin
b744e77f32 1.1.16-alt1
- e18
2013-12-09 22:52:44 +04:00
Michael Shigorin
1283270439 regular.mk: added regular-e18.iso
Thanks aris@ there are now e18 packages available;
everything is almost the same distribution-wise.
2013-12-09 22:50:05 +04:00
Michael Shigorin
32d4aed7f2 x11: added use/x11/e18
The implementation is identical to e17 one.
2013-12-09 22:48:03 +04:00
Michael Shigorin
489e5cf075 desktop+regular: added glxgears
Thanks Aleksey Cheusov for proposing this.
2013-12-09 22:48:03 +04:00
Michael Shigorin
c60813581d regular.mk: un-def -> std-def
kernel-image-un-def doesn't contain suitable aufs as of 3.12.3-alt1,
revert to std-def flavour again for the time being.
2013-12-09 22:48:03 +04:00
Michael Shigorin
a4f1574be1 desktop+live: re-added livecd-firefox
This basically reverts commit c18ef37274
for all practical purposes and restores the problem with chromium livecd
still that's less of a problem compared to regular builds complaining
that firefox is not the default browser when it's the only one anyways.
2013-12-03 16:17:49 +04:00
Michael Shigorin
cdbb759ed5 gear-store-tags 2013-12-02 20:45:20 +04:00
Michael Shigorin
af6b3282d7 1.1.15-alt1
- regular fixups
2013-12-02 20:44:33 +04:00
Michael Shigorin
7e91e1b6d2 net: brief remark regarding livecd-save-nfs
A bit longer version is: add the script which cares to protect
the interfaces which has been brought up during NFS root bootup
already from being tampered with by NetworkManager so as to avoid
losing network with networked rootfs.
2013-11-29 22:21:10 +04:00
Michael Shigorin
63293ff22a regular.mk: do not duplicate domain-client
There's domain-client pkglist out there, no need to pull
alterator-net-shares (and alterator-auth it requries)
everywhere.
2013-11-28 19:51:18 +04:00
Michael Shigorin
394ece8646 desktop.mk: add os-prober to installers
GRUB won't present dualboot systems in boot menu otherwise.
2013-11-28 17:41:42 +04:00
Michael Shigorin
f7c4f3ee61 regular.mk: pick up regular lists for installers
A lot of packages that should be in the classic installable images
got missed during initial effort; start merging the difference.
2013-11-28 17:38:17 +04:00
Michael Shigorin
cadd482725 desktop.mk: need to be able to resize ntfs
We're better off providing NTFS support so that Windows partitions
can be shrunk at least if one's not going to just blow these away
upon encounter.
2013-11-28 17:26:05 +04:00
Michael Shigorin
795d33ab68 regular.mk: drop fuse-exfat
It's a kernel module now.

Suggested-by: glebfm@
2013-11-27 14:46:24 +04:00
Michael Shigorin
ace9227dc5 gear-store-tags 2013-11-25 21:08:36 +04:00
Michael Shigorin
f47091fc8f 1.1.14-alt1
- important bugfix: THE_PACKAGES weren't getting through to .base
- regular-sysv-tde related churn
2013-11-25 21:04:02 +04:00
Michael Shigorin
c18ef37274 desktop+network+live: was redundant
live-webkiosk doesn't really need it and mixin/desktop-installer
was picking it up due to d+n+l satisfying d+n query.  This could
be fixed with && !live but fixing bitrot is the better way to go.
2013-11-25 19:42:42 +04:00
Michael Shigorin
3c40bb0d46 metadata: fix THE_PACKAGES processing
Actually the issue was worse in general: *_PACKAGES
weren't quoted when put into .base thus resulting
in a potentially broken echo command (silent one).

The macro scheme used was overgeneralized; stuffing
quoting differentiation into it was doable but ugly
(unless one is able to pass an unquoted quote sign
as a function's parameter in some elegant manner),
let's just make it straightforward.
2013-11-25 09:30:36 +04:00
Michael Shigorin
f6f7caec30 install2: support vbox guest
It's still inconvenient to discover mouse pointer
captured inside a box, let's overthrow the hardware
node and free it.
2013-11-25 00:38:01 +04:00
Michael Shigorin
815b4ebbe0 speech: should use/sound too
It's sort of pointless otherwise.
2013-11-25 00:17:32 +04:00
Michael Shigorin
f383969f37 desktop.mk: mixin/desktop-installer should use/sound
Its scope of desktop does cover basic multimedia.
2013-11-25 00:17:02 +04:00
Michael Shigorin
7a75cb1320 speech: use emacspeak pkglist
...which has just been imported from m-p-d and looked like
badly missing (yasr wasn't starting).
2013-11-25 00:17:02 +04:00
Michael Shigorin
220c760708 base+regular: added zsh
It's /the/ shell.
2013-11-25 00:17:02 +04:00
Michael Shigorin
9ff4d968d8 regular.mk: add luks to .regular-install
distro/.regular-install depends on use/luks now too;
this isn't a hard decision but so far looks good
given the overall functionality range and balance
within regular builds.
2013-11-24 21:29:04 +04:00
Michael Shigorin
e329617c57 regular.mk: move server to grub for the time being
alterator-lilo needs facelift unfortunately.
2013-11-24 21:29:04 +04:00
Michael Shigorin
b1c18d43da branding: added bootloader to components
branding-*-bootloader was handled for stage1 by syslinux feature
but somehow got missed regarding the installed system; let's fix.
2013-11-24 21:29:04 +04:00
Michael Shigorin
45842a0773 pkglists.txt: s/installer/install2/
It was less clear/greppable what "installer" refers to...
or maybe so it seems to me.
2013-11-24 21:29:04 +04:00
Michael Shigorin
6d1f4f6b89 regular.mk, p7.mk: initial sysvinit tde installer
I've been considering a way to avoid confusion between:
- a tde based livecd with systemd;
- a tde based livecd with sysvinit;
- a tde based installer with sysvinit
and finally came to conclusion that regular-sysv prefix
will be common for installers with sysvinit within regular.mk
and p7.mk; this might be not perfect but should be good enough.

Note that while regular-sysv-tde.iso is buildable and installs
just fine at the moment I don't plan to publish Sisyphus based
installer builds as a rule since these require extra knowledge
regarding daily use (starting with http://altlinux.org/changes
and/or https://lists.altlinux.org/mailman/listinfo/sisyphus ML
subscription).

Sisyphus-based rescue image is fine as well as LiveCDs are;
installable LiveCDs (most of regular-*.iso) are actually
risky in case user actually installs *and* updates those
having ignored the red "unstable" status in the branding,
and that's the line I'm not going to cross that often.
2013-11-24 21:29:04 +04:00
Michael Shigorin
93cd57c8d2 regular.mk: split out a mixin
Parts common to both livecd and installer images factored out
to avoid duplication.
2013-11-24 21:29:04 +04:00
Michael Shigorin
00c58c3725 bootloader: add a guardian
BASE_BOOTLOADER must have been set to any of the supported
bootloader names somewhere during configuration; it is not
impossible to avoid this elsewhere so let's put a guardian
script which will stop the build which is known to result
in a broken image.
2013-11-24 21:29:04 +04:00
Michael Shigorin
657c0bf6ef 00example, bootloader, install2: drop sub/main
sub/main subprofile should not be requested directly
as documented in its README but rather via use/repo/main;
let's fix this discrepancy and check that no regressions
come hurling down.
2013-11-24 21:29:04 +04:00
Michael Shigorin
02e3012d3b regular.mk: grub by default for installers
This image family doesn't inherit from distro/.installer
and thus could miss the bootloader setup with no problems
(at least until an installed system would attempt booting
without a bootloader).

The whole thing requires some more thinking over and probably
moving more bits to mixins but in the mean time let's make sure
the bootloader *is* configured.
2013-11-24 21:29:04 +04:00
Michael Shigorin
b5b96931ad regular.mk: regular-server refactoring
distro/.regular-install is now factored out to be reused in
tde based installer (and potentially more images later on).

This implies sysvinit at the moment which might change too
but looks just fine right now.
2013-11-24 21:29:04 +04:00
Michael Shigorin
f8bdbdd607 desktop.mk: cosmetics
Fixed line length for distro/kde4-lite target,
shouldn't wrap with good ol' 80x24 xterm.
2013-11-24 21:29:04 +04:00
Michael Shigorin
20138959de desktop.mk: split out a mixin
What was added for networked desktop installers is now needed
for regular desktop installers as well; moved to a mixin.
These will probably get reshaked at some point.
2013-11-24 21:29:03 +04:00
Michael Shigorin
87a22774c0 regular.mk: tde bits: move to mixin
distro/.regular-tde-extras is now mixin/regular-tde which pulls in
several extra bits in addition to just the lists.
2013-11-24 21:29:03 +04:00
Michael Shigorin
3c61d471a0 desktop+razorqt: psi-plus was missing!
It's amazing but I've managed to miss out this brilliant
Qt-based Jabber client; a small selection of plugins is
added as well, suggestions are welcome.
2013-11-24 21:19:37 +04:00
Michael Shigorin
737d0d3cb0 rescue+extra: testdisk-doc is no more
...and it was pretty much useless anyways
(real docs are online).
2013-11-24 21:19:37 +04:00
Michael Shigorin
326142c8f6 speech: handle Headphone output too
...and generalize/de-noise the script a bit.
2013-11-22 21:41:33 +04:00
Michael Shigorin
e469a19e2a speech-*: refactored and unified
These two features were largely an internal fork,
let's refactor them into a single tunable one.
2013-11-22 21:28:37 +04:00
Michael Pozhidaev
5dc287f885 Homeros distro changes:
- speech-ru and speech-en features are added;
- speech-related things removed from homeros features;
- speech/ directory for package lists added and other corresponding changes.
2013-11-12 14:05:41 +07:00
Michael Shigorin
08706b6f43 gear-store-tags 2013-11-04 18:56:05 +04:00
215 changed files with 1960 additions and 687 deletions

View File

@@ -1,5 +1,5 @@
Name: mkimage-profiles
Version: 1.1.13
Version: 1.1.52
Release: alt1
Summary: ALT Linux based distribution metaprofile
@@ -12,7 +12,6 @@ Packager: Michael Shigorin <mike@altlinux.org>
BuildArch: noarch
BuildRequires: rsync asciidoc-a2x xmlgraphics-fop fonts-ttf-dejavu
BuildRequires: /proc
Requires: rsync git-core
Requires: time schedutils sfdisk
@@ -29,6 +28,7 @@ Requires: mkimage-preinstall
%package doc
Summary: %name documentation
Group: Development/Documentation
BuildRequires: java /proc
%description
mkimage-profiles is a collection of bits and pieces useful for
@@ -79,6 +79,129 @@ cp -a * %buildroot%mpdir
%doc %docs/*
%changelog
* Mon Nov 17 2014 Michael Shigorin <mike@altlinux.org> 1.1.52-alt1
- docs: "7.0+" (closes: #30474)
- l10n feature
* Mon Nov 10 2014 Michael Shigorin <mike@altlinux.org> 1.1.51-alt1
- current updates
* Mon Oct 27 2014 Michael Shigorin <mike@altlinux.org> 1.1.50-alt1
- minor tweaks
* Mon Oct 13 2014 Michael Shigorin <mike@altlinux.org> 1.1.49-alt1
- pkglist updates
* Mon Sep 29 2014 Michael Shigorin <mike@altlinux.org> 1.1.48-alt1
- (sysv)init: exclude systemd explicitly
* Mon Sep 22 2014 Michael Shigorin <mike@altlinux.org> 1.1.47-alt1
- kpackages() argswap
* Mon Sep 15 2014 Michael Shigorin <mike@altlinux.org> 1.1.46-alt1
- regular fixes
* Mon Sep 01 2014 Michael Shigorin <mike@altlinux.org> 1.1.45-alt1
- starterkits alpha
* Mon Aug 18 2014 Michael Shigorin <mike@altlinux.org> 1.1.44-alt1
- connman fixup
* Mon Aug 04 2014 Michael Shigorin <mike@altlinux.org> 1.1.43-alt1
- fixed package build
* Mon Jul 28 2014 Michael Shigorin <mike@altlinux.org> 1.1.42-alt1
- current bits
* Mon Jul 07 2014 Michael Shigorin <mike@altlinux.org> 1.1.41-alt1
- post-214 fixups
* Mon Jun 30 2014 Michael Shigorin <mike@altlinux.org> 1.1.40-alt1
- systemd-214
* Mon Jun 16 2014 Michael Shigorin <mike@altlinux.org> 1.1.39-alt1
- starterkits-20140612
* Mon Jun 02 2014 Michael Shigorin <mike@altlinux.org> 1.1.38-alt1
- mksquashfs 4.3 support
* Mon May 26 2014 Michael Shigorin <mike@altlinux.org> 1.1.37-alt1
- use/browser
* Mon May 19 2014 Michael Shigorin <mike@altlinux.org> 1.1.36-alt1
- regular-lxqt
* Mon May 12 2014 Michael Shigorin <mike@altlinux.org> 1.1.35-alt1
- yet another rescue week
* Mon May 05 2014 Michael Shigorin <mike@altlinux.org> 1.1.34-alt1
- remember Odessa
* Mon Apr 28 2014 Michael Shigorin <mike@altlinux.org> 1.1.33-alt1
- net-eth tweaks
* Mon Apr 21 2014 Michael Shigorin <mike@altlinux.org> 1.1.32-alt1
- regular-rescue week
* Mon Apr 14 2014 Michael Shigorin <mike@altlinux.org> 1.1.31-alt1
- live: refactoring
- forensics mode
* Mon Apr 07 2014 Michael Shigorin <mike@altlinux.org> 1.1.30-alt1
- robotics support
* Mon Mar 31 2014 Michael Shigorin <mike@altlinux.org> 1.1.29-alt1
- mediacheck feature
* Mon Mar 24 2014 Michael Shigorin <mike@altlinux.org> 1.1.28-alt1
- install2: more cleanups
* Mon Mar 17 2014 Michael Shigorin <mike@altlinux.org> 1.1.27-alt1
- don't insist on k-m-r8168
- codebase deduplication
* Mon Mar 10 2014 Michael Shigorin <mike@altlinux.org> 1.1.26-alt1
- docs week
- deflogin: empty ROOTPW explicitly ignored (potential security fix)
* Mon Mar 03 2014 Michael Shigorin <mike@altlinux.org> 1.1.25-alt1
- regular updates
* Mon Feb 10 2014 Michael Shigorin <mike@altlinux.org> 1.1.24-alt1
- service bridge
* Mon Feb 03 2014 Michael Shigorin <mike@altlinux.org> 1.1.23-alt1
- live, net*, syslinux fixes (see also #26608)
* Mon Jan 27 2014 Michael Shigorin <mike@altlinux.org> 1.1.22-alt1
- ahci kludge (see #29705) :(
* Mon Jan 20 2014 Michael Shigorin <mike@altlinux.org> 1.1.21-alt1
- rescue tweaks
* Mon Jan 13 2014 Michael Shigorin <mike@altlinux.org> 1.1.20-alt1
- support for CIFS installation method (sin@)
- glibc-locales for regular images (closes: #29693)
* Mon Dec 30 2013 Michael Shigorin <mike@altlinux.org> 1.1.19-alt1
- regular fixes
* Mon Dec 23 2013 Michael Shigorin <mike@altlinux.org> 1.1.18-alt1
- efi updates
* Mon Dec 16 2013 Michael Shigorin <mike@altlinux.org> 1.1.17-alt1
- refind branding
* Mon Dec 09 2013 Michael Shigorin <mike@altlinux.org> 1.1.16-alt1
- e18
* Mon Dec 02 2013 Michael Shigorin <mike@altlinux.org> 1.1.15-alt1
- regular fixups
* Mon Nov 25 2013 Michael Shigorin <mike@altlinux.org> 1.1.14-alt1
- important bugfix: THE_PACKAGES weren't getting through to .base
- regular-sysv-tde related churn
* Mon Nov 04 2013 Michael Shigorin <mike@altlinux.org> 1.1.13-alt1
- rescue friday

View File

@@ -1,6 +0,0 @@
object c104fd03419bfafeb31cdc502be79ec73b358442
type commit
tag v1.1.12
tagger Michael Shigorin <mike@altlinux.org> 1382380626 +0400
live-builder update

View File

@@ -0,0 +1,6 @@
object 4e2e450b3a9aaf0ee20e075f3057e4e9e746886f
type commit
tag v1.1.51
tagger Michael Shigorin <mike@altlinux.org> 1415640567 +0300
current updates

View File

@@ -1 +1 @@
299cfbec31d609d794732265630fc6b109f8d184 v1.1.12
bba8b02b8e4a143d52dd9f23e65960f72b0c492e v1.1.51

View File

@@ -68,3 +68,6 @@ SHELL = /bin/bash
docs:
@$(MAKE) -C doc
docs-publish:
@$(MAKE) -C doc publish

View File

@@ -3,7 +3,7 @@ http://en.altlinux.org/Hasher; large tmpfs helps a lot).
требуется
~~~~~~~~~
- ALT Linux 6.0 или выше (возможна адаптация "вниз")
- ALT Linux 7.0 или выше (возможна адаптация "вниз")
- установленный mkimage (свежий, как и hasher)
- пользователь с правом запуска hasher
@@ -19,7 +19,7 @@ http://en.altlinux.org/Hasher; large tmpfs helps a lot).
~~~~~~~
от имени root::
----
# apt-get install mkimage hasher git-core
# apt-get install mkimage mkimage-preinstall hasher git-core
# hasher-useradd USER
----
@@ -27,7 +27,7 @@ http://en.altlinux.org/Hasher; large tmpfs helps a lot).
----
$ git config --global user.email "my@email"
$ git config --global user.name "My Name"
$ mkdir ~/out
$ mkdir -p ~/out ~/tmp
----
тестовая сборка::
@@ -51,3 +51,4 @@ $ make ARCH=i586 APTCONF=~/apt/apt.conf.i586 REPORT=1 ve/generic.tar
- http://www.altlinux.org/hasher
- http://www.altlinux.org/mkimage
- http://www.altlinux.org/m-p
- http://www.altlinux.org/m-p-howto ("как поправить под себя")

12
README
View File

@@ -21,7 +21,7 @@
Особенности:
* метапрофиль может быть полностью read-only при сборке
* метапрофиль при сборке может быть доступен только на чтение
* для сборки подыскивается предпочтительно tmpfs
* в профиль копируются только нужные объекты;
он автономен относительно метапрофиля
@@ -36,10 +36,9 @@
Объекты:
* дистрибутивы и виртуальные среды/машины:
** описываются в conf.d/*.mk или соответственно lib/{distro,ve,vm}.mk
** описываются в conf.d/*.mk
** могут основываться на предшественниках, расширяя их
** дистрибутивы также:
*** включают один или более субпрофилей по надобности
** дистрибутивы также включают один или более субпрофилей по надобности
** желательно избегать множественного наследования, см. тж. фичи
* субпрофили:
** список собирается в $(SUBPROFILES)
@@ -66,12 +65,15 @@
См. тж.:
* http://altlinux.org/m-p
* http://altlinux.org/m-p: обзорная документация, в т.ч. howto
* doc/:
** params.txt: переменные, указываемые при запуске сборки
** pkglists.txt: формирование состава образа
** features.txt: обзор подключаемых особенностей
Примечание: пути в документации задаются от каталога верхнего уровня,
если не указаны как относительные в явном виде (./) или по смыслу.
Удачи; что не так -- пишите.
Michael Shigorin <mike@altlinux.org>

View File

@@ -30,4 +30,7 @@ transformed="$(sed \
-e "s, *) *, ) ,g")"
[ "$DEBUG" = 2 ] && echo "`basename $0`: transformed = \"$transformed\"" >&2
[ -z "$transformed" ] || find $transformed | sed 's,^\./,,' | grep -v '\.sw.$'
[ -z "$transformed" ] ||
find $transformed \
| sed 's,^\./,,' \
| egrep -v '(\.sw.|~)$'

View File

@@ -167,6 +167,20 @@ if [ -n "$BOOTPART" ]; then
mkfs."$BOOTFSTYPE" "$LOOPBOOT"
fi
ROOTUUID="$(blkid -s UUID -o value -c /dev/null "$LOOPROOT")"
if [ -n "$ROOTUUID" ]; then
ROOTDEV="UUID=$ROOTUUID"
else
ROOTDEV="$LOOPROOT"
fi
if [ -n "$BOOTPART" ]; then
BOOTUUID="$(blkid -s UUID -o value -c /dev/null "$LOOPBOOT")"
if [ -n "$ROOTUUID" ]; then
BOOTDEV="UUID=$BOOTUUID"
fi
fi
# mount and populate it
mkdir -pm755 "$ROOTFS"
mount "$LOOPROOT" "$ROOTFS"
@@ -180,14 +194,14 @@ tar -C "$ROOTFS" --numeric-owner -xf "$TAR"
for i in /dev /proc /sys; do mount --bind "$i" "$ROOTFS$i"; done
# loop device so lilo could work...
echo "$LOOPROOT / $ROOTFSTYPE relatime 1 1" >> "$ROOTFS/etc/fstab"
echo "$ROOTDEV / $ROOTFSTYPE relatime 1 1" >> "$ROOTFS/etc/fstab"
# target device at once
if [ -n "$BOOTPART" ]; then
echo "$BOOTDEV /boot $BOOTFSTYPE defaults 1 2" >> "$ROOTFS/etc/fstab"
fi
echo "MODULES_PRELOAD=$INITRD_MODULES $ROOTFSTYPE" >> "$ROOTFS/etc/initrd.mk"
echo "MODULES_PRELOAD += $INITRD_MODULES $ROOTFSTYPE" >> "$ROOTFS/etc/initrd.mk"
KERNEL="$(readlink $ROOTFS/boot/vmlinuz | sed 's,vmlinuz-,,')"
chroot "$ROOTFS" make-initrd -k "$KERNEL"

View File

@@ -12,7 +12,13 @@
Попросту говоря, copy-paste -- тревожный признак.
По переменным (см. тж. ../doc/pkglists.txt):
Вместо него нередко может помочь выделение кусочков конфигурации
в пределах включаемого файла в цели mixin/*, которые не являются
самостоятельными или даже промежуточными, но включают полезные
группы настроек, нужных в различных образах, не наследующих
друг другу -- посмотрите существующие примеры использования.
По переменным (см. тж. doc/pkglists.txt):
* для пользовательского окружения (live, main) предназначены
THE_PACKAGES, THE_LISTS, THE_GROUPS, THE_PACKAGES_REGEXP

View File

@@ -45,14 +45,13 @@ vm/.cubox-bare: vm/.arm-base use/armh-cubox use/net-ssh use/repo use/tty/S0
@$(call add,BASE_PACKAGES,glibc-locales vim-console rsync)
vm/.cubox-desktop: vm/.cubox-bare use/armh-dovefb +systemd +pulse \
use/armh-cubox use/branding use/xdg-user-dirs/deep
use/armh-cubox use/branding use/xdg-user-dirs/deep \
use/fonts/otf/adobe use/fonts/ttf/redhat use/fonts/ttf/ubuntu
@$(call set,BRANDING,altlinux-kdesktop)
@$(call add,THE_BRANDING,alterator graphics indexhtml menu notes)
@$(call add,BASE_PACKAGES,parole gst-ffmpeg gst-plugins-vmeta)
@$(call add,BASE_PACKAGES,gst-plugins-good gst-plugins-nice)
@$(call add,BASE_PACKAGES,gst-plugins-bad gst-plugins-ugly)
@$(call add,BASE_PACKAGES,fonts-ttf-droid fonts-ttf-ubuntu-font-family)
@$(call add,BASE_PACKAGES,fonts-ttf-liberation fonts-ttf-dejavu)
@$(call add,BASE_PACKAGES,LibreOffice4-full LibreOffice4-langpack-ru)
@$(call add,BASE_LISTS,$(call tags,(base || desktop) && regular))

View File

@@ -6,16 +6,20 @@ distro/.desktop-base: distro/.installer use/syslinux/ui/vesamenu use/x11/xorg
distro/.desktop-mini: distro/.desktop-base use/x11/xdm +power; @:
distro/.desktop-network: distro/.desktop-mini use/stage2/net-eth +vmguest
mixin/desktop-installer: use/x11-autostart use/sound +net-eth +vmguest
@$(call add,SYSTEM_PACKAGES,fonts-ttf-google-croscore-arimo)
@$(call add,BASE_PACKAGES,udev-rule-generator-net sysklogd)
@$(call add,BASE_LISTS, \
$(call tags,(base || desktop) && (l10n || network)))
@$(call add,INSTALL2_PACKAGES,ntfs-3g)
@$(call add,BASE_PACKAGES,os-prober)
distro/.desktop-network: distro/.desktop-mini mixin/desktop-installer; @:
distro/.desktop-extra:
@$(call add,BASE_LISTS,$(call tags,(archive || base) && (extra)))
distro/kde4-lite: distro/.desktop-mini distro/.desktop-network distro/.desktop-extra +kde4-lite
distro/kde4-lite: distro/.desktop-mini \
distro/.desktop-network distro/.desktop-extra +kde4-lite
@$(call set,KFLAVOURS,std-def)
distro/tde: distro/.desktop-network +tde; @:

View File

@@ -1,6 +1,6 @@
ifeq (distro,$(IMAGE_CLASS))
distro/homeros-mini: distro/.live-base use/live/textinstall use/homeros; @:
distro/homeros-mini: distro/.live-base use/live/textinstall \
use/homeros use/speech/en use/isohybrid; @:
endif

View File

@@ -16,13 +16,14 @@ distro/.live-desktop: distro/.base +live use/live/install use/stage2/net-eth \
use/plymouth/live; @:
distro/.live-desktop-ru: distro/.live-desktop use/live/ru; @:
distro/.live-kiosk: distro/.base use/live/base use/live/autologin +power \
use/syslinux/timeout/1 use/cleanup use/stage2/net-eth
@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu)
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')
distro/live-builder-mini: distro/.live-base use/dev/mkimage use/dev \
use/stage2/net-eth use/net-eth/dhcp use/syslinux/timeout/30
use/stage2/net-eth use/net-eth/dhcp use/syslinux/timeout/30 \
use/isohybrid
@$(call set,KFLAVOURS,$(BIGRAM))
@$(call add,LIVE_LISTS,\
$(call tags,(base || live) && (server || builder)))
@@ -31,7 +32,7 @@ distro/live-builder-mini: distro/.live-base use/dev/mkimage use/dev \
@$(call add,LIVE_PACKAGES,zsh sudo)
distro/live-builder: distro/live-builder-mini \
use/live/rw use/live/repo use/dev/repo
use/efi/signed use/live/rw use/live/repo use/dev/repo
@$(call add,MAIN_LISTS,$(call tags,live builder))
@$(call add,MAIN_PACKAGES,syslinux pciids memtest86+ mkisofs)
@@ -43,41 +44,65 @@ 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
distro/live-rescue: distro/live-icewm +efi
@$(call add,LIVE_LISTS,$(call tags,rescue && (fs || live || x11)))
@$(call add,LIVE_LISTS,openssh \
$(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
@$(call add,LIVE_LISTS,$(call tags,desktop && (live || network)))
@$(call add,LIVE_LISTS,$(call tags,live desktop))
distro/.live-webkiosk-gtk: distro/.live-webkiosk
@$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*')
distro/live-webkiosk-mini: distro/.live-webkiosk
distro/live-webkiosk-mini: distro/.live-webkiosk-gtk \
use/fonts/otf/mozilla use/isohybrid
@$(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 +vmguest
@$(call add,LIVE_PACKAGES,mozilla-plugin-adobe-flash)
@$(call add,LIVE_PACKAGES,mozilla-plugin-java-1.6.0-sun)
distro/live-webkiosk-flash: distro/live-webkiosk-mini use/plymouth/live \
use/browser/plugin/flash use/browser/plugin/java use/efi/signed \
+vmguest; @:
distro/live-webkiosk: distro/live-webkiosk-mini use/live/desktop; @:
distro/live-webkiosk-chromium: distro/.live-webkiosk
distro/live-webkiosk-chromium: distro/.live-webkiosk use/fonts/ttf/google
@$(call add,LIVE_PACKAGES,livecd-webkiosk-chromium)
distro/live-flightgear: distro/.live-x11 use/x11/lightdm/gtk use/x11/3d +icewm
distro/live-webkiosk-seamonkey: distro/.live-webkiosk use/fonts/ttf/google
@$(call add,LIVE_PACKAGES,livecd-webkiosk-seamonkey)
distro/live-webkiosk-qupzilla: distro/.live-webkiosk use/fonts/otf/mozilla
@$(call add,LIVE_PACKAGES,livecd-webkiosk-qupzilla)
distro/.live-3d: distro/.live-x11 use/x11/3d \
use/x11/lightdm/gtk +icewm +sysvinit
@$(call add,LIVE_PACKAGES,glxgears glxinfo)
distro/live-glxgears: distro/.live-3d; @:
distro/live-flightgear: distro/.live-kiosk use/x11/3d use/sound \
use/stage2/net-eth use/net-eth/dhcp use/services +efi +sysvinit
@$(call set,KFLAVOURS,un-def)
@$(call add,LIVE_LISTS,$(call tags,xorg misc))
@$(call add,LIVE_PACKAGES,FlightGear fgo input-utils)
@$(call add,LIVE_PACKAGES,FlightGear FlightGear-tu154b)
@$(call add,LIVE_PACKAGES,fgo input-utils livecd-fgfs)
@$(call add,LIVE_PACKAGES,glxgears glxinfo)
@$(call add,DEFAULT_SERVICES_DISABLE,rpcbind alteratord messagebus)
@$(call add,SERVICES_DISABLE,livecd-net-eth)
@$(call try,HOMEPAGE,http://www.4p8.com/eric.brasseur/flight_simulator_tutorial.html)
distro/live-e17: distro/.live-desktop-ru use/x11/e17 use/x11/lightdm/gtk; @:
distro/live-gimp: distro/live-icewm use/live/ru
@$(call add,LIVE_PACKAGES,gimp tintii immix fim)
@$(call add,LIVE_PACKAGES,cvltonemap darktable geeqie rawstudio ufraw)
@$(call add,LIVE_PACKAGES,sane sane-frontends xsane)
@$(call add,LIVE_PACKAGES,darktable geeqie rawstudio ufraw)
@$(call add,LIVE_PACKAGES,macrofusion python-module-pygtk-libglade)
@$(call add,LIVE_PACKAGES,qtfm openssh-clients rsync)
@$(call add,LIVE_PACKAGES,qtfm openssh-clients rsync usbutils)
@$(call add,LIVE_PACKAGES,design-graphics-sisyphus2)
distro/live-robo: distro/live-icewm +robotics use/live/ru; @:
endif

View File

@@ -5,13 +5,16 @@ mixin/p7:
ifeq (distro,$(IMAGE_CLASS))
### kludge compatibility: introspection stub for ../main.mk :-/
### kludge compatibility: introspection stub for main.mk :-/
distro/altlinux-p7-cinnamon: distro/regular-cinnamon mixin/p7; @:
distro/altlinux-p7-e17: distro/regular-e17 mixin/p7; @:
distro/altlinux-p7-icewm: distro/regular-icewm mixin/p7; @:
distro/altlinux-p7-gnome3: distro/regular-gnome3 mixin/p7; @:
distro/altlinux-p7-gnustep: distro/regular-gnustep mixin/p7; @:
distro/altlinux-p7-kde4: distro/regular-kde4 mixin/p7; @:
distro/altlinux-p7-lxde: distro/regular-lxde mixin/p7; @:
distro/altlinux-p7-lxqt: distro/regular-lxqt mixin/p7; @:
distro/altlinux-p7-lxqt-sysv: distro/regular-lxqt-sysv mixin/p7; @:
distro/altlinux-p7-mate: distro/regular-mate mixin/p7; @:
distro/altlinux-p7-razorqt: distro/regular-razorqt mixin/p7; @:
distro/altlinux-p7-rescue: distro/regular-rescue mixin/p7; @:
@@ -20,10 +23,19 @@ distro/altlinux-p7-tde-sysv: distro/regular-tde-sysv mixin/p7; @:
distro/altlinux-p7-wmaker: distro/regular-wmaker mixin/p7; @:
distro/altlinux-p7-xfce: distro/regular-xfce mixin/p7; @:
distro/altlinux-p7-sysv-tde: distro/regular-sysv-tde mixin/p7; @:
distro/altlinux-p7-jeos: distro/regular-jeos mixin/p7; @:
distro/altlinux-p7-server: distro/regular-server mixin/p7; @:
distro/altlinux-p7-server-ovz: distro/regular-server-ovz mixin/p7; @:
distro/altlinux-p7-server-hyperv: distro/regular-server-hyperv mixin/p7; @:
endif
ifeq (ve,$(IMAGE_CLASS))
ve/altlinux-p7: ve/generic mixin/p7; @:
ve/altlinux-p7-ovz-generic: ve/generic mixin/p7; @:
endif
ifeq (vm,$(IMAGE_CLASS))
vm/altlinux-p7-vm-net: vm/net mixin/p7; @:
endif

View File

@@ -2,108 +2,206 @@
ifeq (distro,$(IMAGE_CLASS))
# common ground
distro/.regular-bare: distro/.base +wireless use/efi/signed \
use/memtest use/stage2/net-eth use/kernel/net
distro/.regular-bare: distro/.base +wireless +net-eth \
use/efi/signed use/memtest use/kernel/net
@$(call try,SAVE_PROFILE,yes)
# graphical target (not enforcing xorg drivers or blobs)
distro/.regular-x11: distro/.regular-bare use/x11/wacom +vmguest \
use/live/x11 use/live/install use/live/repo use/live/rw \
use/luks use/branding
use/luks use/branding use/browser/firefox/live use/browser/firefox/i18n
@$(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)
# common WM live/installer bits
mixin/regular-desktop: use/x11/xorg use/sound use/xdg-user-dirs
@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
@$(call add,THE_PACKAGES,alterator-notes)
@$(call add,THE_BRANDING,alterator graphics indexhtml notes)
# WM base target
distro/.regular-base: distro/.regular-x11 use/x11/xorg
@$(call add,LIVE_PACKAGES,installer-feature-desktop-other-fs-stage2)
@$(call add,LIVE_PACKAGES,alterator-notes)
@$(call add,THE_BRANDING,indexhtml notes alterator)
@$(call add,THE_BRANDING,graphics)
distro/.regular-base: distro/.regular-x11 mixin/regular-desktop
# DE base target
# TODO: use/plymouth/live when luks+plymouth is done, see also #28255
distro/.regular-desktop: distro/.regular-base \
use/syslinux/ui/gfxboot use/firmware/laptop use/efi/refind +systemd
@$(call add,LIVE_PACKAGES,fuse-exfat)
@$(call add,LIVE_LISTS,domain-client)
@$(call add,THE_BRANDING,bootloader)
@$(call add,DEFAULT_SERVICES_DISABLE,gssd idmapd krb5kdc rpcbind)
@$(call set,KFLAVOURS,std-def)
distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
distro/.regular-sysv: distro/.regular-base use/init/sysv; @:
distro/.regular-sysv-gtk: distro/.regular-sysv use/x11/lightdm/gtk; @:
distro/.regular-sysv: distro/.regular-base +sysvinit; @:
distro/.regular-sysv-gtk: distro/.regular-sysv use/syslinux/ui/gfxboot \
use/x11/gdm2.20; @:
distro/regular-icewm: distro/.regular-sysv-gtk +icewm
distro/.regular-install: distro/.regular-bare +installer +sysvinit +power \
use/branding use/bootloader/grub use/luks \
use/install2/fs use/install2/vnc use/install2/repo
@$(call add,THE_LISTS,$(call tags,base regular))
@$(call add,INSTALL2_BRANDING,alterator notes)
@$(call add,THE_BRANDING,alterator)
# NB:
# - no +power or even use/power/acpi/button on intent
# - stock cleanup is not enough (or installer-common-stage3 deps soaring)
distro/regular-jeos: distro/.base use/isohybrid +sysvinit +net-eth \
use/install2/packages use/install2/vmguest use/vmguest/base \
use/branding use/bootloader/lilo use/syslinux/lateboot.cfg \
use/install2/cleanup/everything use/install2/cleanup/kernel/everything \
use/cleanup/x11-alterator use/net use/kernel/net use/power/acpi/button
@$(call set,KFLAVOURS,led-ws) # led-vs might be nice here
@$(call add,BASE_KMODULES,guest scsi vboxguest)
@$(call set,INSTALLER,altlinux-generic)
@$(call add,INSTALL2_BRANDING,alterator notes)
@$(call add,THE_BRANDING,alterator) # just to be cleaned up later on
@$(call add,THE_PACKAGES,apt basesystem dhcpcd openssh vim-console)
@# a *lot* of stray things get pulled in by alterator modules
@$(call add,CLEANUP_PACKAGES,libICE 'libX*' libxcb libfreetype)
@$(call add,CLEANUP_PACKAGES,fontconfig 'glib2*' libffi 'libltdl*')
@$(call add,CLEANUP_PACKAGES,liblcms libjpeg 'libpng*' 'libtiff*')
@$(call add,CLEANUP_PACKAGES,avahi-autoipd bridge-utils) # i-c-stage3
@$(call add,CLEANUP_PACKAGES,iw wpa_supplicant)
@$(call add,CLEANUP_PACKAGES,openssl libpcsclite)
@# fully fledged interactivesystem isn't needed here either
@$(call add,CLEANUP_PACKAGES,interactivesystem 'groff*' man stmpclean)
@$(call add,CLEANUP_PACKAGES,glibc-gconv-modules gettext)
@$(call add,CLEANUP_PACKAGES,console-scripts console-vt-tools 'kbd*')
@$(call add,CLEANUP_PACKAGES,libsystemd-journal libsystemd-login)
@$(call add,CLEANUP_PACKAGES,dbus libdbus libcap-ng)
distro/.regular-install-x11: distro/.regular-install \
mixin/regular-desktop +vmguest
@$(call set,INSTALLER,altlinux-desktop)
@$(call add,THE_LISTS,$(call tags,regular desktop))
distro/regular-icewm: distro/.regular-sysv-gtk +icewm \
use/browser/seamonkey/i18n use/fonts/ttf/redhat
@$(call add,LIVE_LISTS,$(call tags,regular icewm))
@$(call add,LIVE_PACKAGES,gparted mnt)
@$(call set,KFLAVOURS,un-def)
distro/regular-wmaker: distro/.regular-sysv-gtk use/x11/wmaker \
use/syslinux/ui/gfxboot use/efi/refind
mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot use/x11/wmaker
@$(call add,LIVE_PACKAGES,livecd-install-wmaker)
@$(call add,LIVE_PACKAGES,xxkb)
@$(call add,MAIN_PACKAGES,wmgtemp wmhdaps wmpomme wmxkbru)
@$(call add,LIVE_PACKAGES,installer-feature-no-xconsole-stage3)
@$(call add,MAIN_PACKAGES,wmgtemp wmhdaps wmpomme wmxkbru xxkb)
ifeq (i586,$(ARCH))
distro/regular-gnustep: distro/regular-wmaker use/x11/gnustep +plymouth
# 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 set,KFLAVOURS,led-ws)
# 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
@$(call add,THE_BRANDING,graphics)
else
distro/regular-gnustep:
$(error $@ is known buggy on non-i586 at the moment)
endif
distro/regular-xfce: distro/.regular-gtk use/x11/xfce +nm; @:
distro/regular-gnustep: distro/.regular-sysv \
mixin/regular-wmaker mixin/regular-gnustep; @:
distro/regular-gnustep-systemd: distro/.regular-base +systemd \
mixin/regular-wmaker mixin/regular-gnustep; @:
distro/regular-lxde: distro/.regular-gtk use/x11/lxde use/fonts/infinality +nm
distro/regular-xfce: distro/.regular-gtk \
use/x11/xfce use/domain-client/full use/browser/firefox/classic \
use/x11/gtk/nm +nm; @:
distro/regular-lxde: distro/.regular-gtk use/x11/lxde use/fonts/infinality \
use/x11/gtk/nm +nm
@$(call add,LIVE_LISTS,$(call tags,desktop gvfs))
distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad
@$(call add,LIVE_PACKAGES,livecd-regular-xmonad)
distro/regular-mate: distro/.regular-gtk use/x11/mate +nm
distro/regular-mate: distro/.regular-gtk +nm \
use/x11/mate use/fonts/ttf/google use/domain-client/full
@$(call add,LIVE_LISTS,$(call tags,mobile mate))
distro/regular-e17: distro/.regular-gtk use/x11/e17 use/fonts/infinality
@$(call add,LIVE_PACKAGES,xterm)
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-cinnamon: distro/.regular-gtk \
use/x11/cinnamon use/fonts/infinality
use/x11/cinnamon use/fonts/infinality use/net/nm/mmgui
@$(call set,META_VOL_ID,ALT Linux $(IMAGE_NAME)) # see also #28271
@$(call set,KFLAVOURS,un-def)
distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3 +plymouth; @:
# not .regular-gtk due to gdm vs lightdm
distro/regular-gnome3: distro/.regular-desktop \
use/x11/gnome3 use/browser/epiphany +plymouth +nm
@$(call add,LIVE_PACKAGES,livecd-gnome3-nosetup)
# reusable bits
distro/.regular-tde-extras:
@$(call add,LIVE_PACKAGES,kdegames kdeedu)
@$(call add,LIVE_LISTS,openscada)
mixin/regular-tde: use/syslinux/ui/gfxboot use/browser/firefox/classic \
+tde +plymouth
@$(call add,THE_PACKAGES,kdeedu)
@$(call add,THE_LISTS,openscada)
distro/regular-tde: distro/.regular-desktop distro/.regular-tde-extras \
+tde +plymouth +nm; @:
distro/regular-tde: distro/.regular-desktop mixin/regular-tde \
use/x11/gtk/nm use/net/nm/mmgui; @:
distro/regular-tde-sysv: distro/.regular-sysv distro/.regular-tde-extras \
use/net-eth/dhcp use/syslinux/ui/gfxboot use/efi/refind \
+tde +plymouth; @:
distro/regular-tde-sysv: distro/.regular-sysv mixin/regular-tde \
use/net-eth/dhcp use/efi/refind; @:
distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4 \
use/fonts/zerg +pulse +plymouth
distro/regular-kde4: distro/.regular-desktop use/x11/kde4/nm use/x11/kdm4 \
use/browser/konqueror4 use/fonts/zerg use/domain-client/full \
use/net/nm/mmgui +pulse +plymouth
@$(call add,LIVE_LISTS,$(call tags,regular kde4))
@$(call add,LIVE_PACKAGES,rosa-imagewriter)
@$(call add,DEFAULT_SERVICES_ENABLE,prefdm)
distro/regular-razorqt: distro/.regular-desktop +razorqt +plymouth; @:
mixin/regular-lxqt: use/x11/lxqt use/x11/lightdm/lxqt \
use/browser/qupzilla +plymouth; @:
distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt +nm; @:
distro/regular-lxqt-sysv: distro/.regular-sysv mixin/regular-lxqt \
use/net-eth/dhcp use/efi/refind; @:
distro/regular-sugar: distro/.regular-gtk use/x11/sugar; @:
distro/regular-rescue: distro/.regular-bare use/rescue/rw \
use/syslinux/ui/menu use/hdt use/efi/refind use/efi/shell
# NB: never ever use/syslinux/ui/gfxboot here as gfxboot mangles
# kernel cmdline resulting in method:disk instead of method:cdrom
# which will change propagator's behaviour to probe additional
# filesystems (ro but no loop) thus potentially writing to
# an unrecovered filesystem's journal
distro/regular-rescue: distro/.regular-bare use/rescue/rw use/luks \
use/branding use/efi/refind use/efi/shell use/efi/memtest86 \
use/hdt use/syslinux/ui/menu use/syslinux/rescue_fm.cfg \
use/syslinux/timeout/200 use/mediacheck test/rescue/no-x11
@$(call set,KFLAVOURS,un-def)
@$(call add,RESCUE_PACKAGES,gpm)
distro/regular-server: distro/.regular-bare +installer +sysvinit +power \
use/install2/fs use/bootloader/lilo use/firmware use/server/mini \
use/branding use/luks
@$(call add,THE_LISTS,$(call tags,(base || server) && regular))
distro/regular-sysv-tde: distro/.regular-install-x11 \
mixin/desktop-installer mixin/regular-tde \
use/branding/complete use/branding/slideshow/once \
use/net-eth/dhcp use/efi/refind use/efi/shell use/rescue/base \
use/fonts/otf/adobe use/fonts/otf/mozilla
@$(call set,KFLAVOURS,led-ws)
@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
@$(call add,THE_LISTS,$(call tags,base desktop))
@$(call add,THE_LISTS,$(call tags,regular tde))
@$(call add,MAIN_PACKAGES,man-whatis usb-modeswitch)
distro/regular-server: distro/.regular-install use/server/mini use/rescue/base
@$(call add,THE_LISTS,$(call tags,regular server))
@$(call add,MAIN_PACKAGES,aptitude)
@$(call set,INSTALLER,altlinux-server)
@$(call add,INSTALL2_BRANDING,alterator notes)
@$(call add,THE_BRANDING,alterator)
distro/regular-server-ovz: distro/regular-server \
use/server/ovz use/server/groups/base; @:
distro/regular-server-hyperv: distro/regular-server
@$(call set,KFLAVOURS,un-def)
@$(call add,THE_PACKAGES,hyperv-daemons)
@$(call add,THE_PACKAGES,alterator-fbi)
@$(call add,THE_LISTS,$(call tags,server alterator))
@$(call add,DEFAULT_SERVICES_DISABLE,ahttpd alteratord)
@$(call add,DEFAULT_SERVICES_DISABLE,bridge cpufreq-simple)
endif

View File

@@ -5,24 +5,20 @@ distro/.server-base: distro/.installer use/syslinux/ui/menu use/memtest \
use/cleanup/x11-alterator
@$(call add,BASE_LISTS,server-base openssh)
distro/server-nano: distro/.server-base use/bootloader/lilo +power
distro/server-nano: distro/.server-base use/bootloader/lilo +power \
use/install2/cleanup/crypto use/install2/cleanup/vnc
@$(call add,BASE_LISTS,$(call tags,server network))
@$(call add,BASE_PACKAGES,dhcpcd cpio)
distro/server-mini: distro/.server-base use/server/mini use/kernel/net \
use/efi use/stage2/net-eth
distro/server-mini: distro/.server-base +net-eth \
use/server/mini use/kernel/net use/efi use/power/acpi/button
@$(call set,INSTALLER,altlinux-server)
@$(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/cpu use/power/acpi/button +wireless
@$(call set,STAGE1_KFLAVOUR,std-def)
@$(call set,KFLAVOURS,std-def ovz-el)
@$(call add,MAIN_KMODULES,ipset ipt-netflow opendpi pf_ring)
@$(call add,MAIN_KMODULES,xtables-addons) # t6/branch
@$(call add,MAIN_KMODULES,drbd83 kvm)
@$(call add,BASE_LISTS,ovz-server)
@$(call add,MAIN_GROUPS,dns-server http-server ftp-server kvm-server)
@$(call add,MAIN_GROUPS,ipmi mysql-server dhcp-server mail-server)
@$(call add,MAIN_GROUPS,monitoring diag-tools)
distro/server-ovz: distro/server-mini use/server/ovz use/server/groups/base \
use/install2/net use/hdt use/rescue \
use/firmware/server use/firmware/cpu +wireless; @:
distro/server-zabbix: distro/server-mini use/server/zabbix; @:
endif

13
conf.d/t7.mk Normal file
View File

@@ -0,0 +1,13 @@
# t7 base kits
mixin/t7:
@$(call set,BRANDING,altlinux-starterkit) ### needs changing
ifeq (distro,$(IMAGE_CLASS))
distro/altlinux-t7-gnustep: distro/regular-gnustep mixin/t7; @:
distro/altlinux-t7-gnustep-systemd: distro/regular-gnustep-systemd mixin/t7; @:
distro/altlinux-t7-tde: distro/regular-tde mixin/t7; @:
distro/altlinux-t7-sysv-tde: distro/regular-sysv-tde mixin/t7; @:
endif

View File

@@ -8,9 +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-isomd5sum: distro/.base use/live/base use/isomd5sum
@$(call add,LIVE_PACKAGES,livecd-isomd5sum)
distro/live-mediacheck: distro/.base use/mediacheck; @:
distro/live-testserver: distro/live-install use/server/mini
@$(call set,KFLAVOURS,std-def el-smp)
@@ -19,6 +17,11 @@ distro/live-gns3: distro/live-icewm
@$(call add,LIVE_LISTS,gns3)
@$(call add,LIVE_KMODULES,kvm virtualbox)
# NB: requires runtime Server/ServerActive setup in zabbix_agentd.conf
distro/live-zabbix: distro/live-icewm use/net-eth
@$(call add,THE_PACKAGES,zabbix-agent)
@$(call add,DEFAULT_SERVICES_ENABLE,zabbix_agentd)
distro/icewm-efi: distro/icewm use/efi/debug use/firmware
@$(call add,INSTALL2_PACKAGES,strace)
@@ -46,6 +49,25 @@ distro/desktop-systemd: distro/icewm +systemd; @:
distro/desktop-plymouth: distro/icewm +plymouth; @:
distro/server-efi: distro/server-mini use/efi/debug; @:
distro/server-zabbix: distro/server-mini use/server/zabbix use/net-eth
# a crop of images running stuff as PID 1
distro/bash: distro/.base use/pid1
@$(call add,STAGE1_PACKAGES,bash)
@$(call set,PID1_BIN,/bin/bash)
distro/vi: distro/.base use/pid1
@$(call add,STAGE1_PACKAGES,vim-minimal)
@$(call set,PID1_BIN,/bin/vi)
distro/emacs: distro/.base use/pid1
@$(call add,STAGE1_PACKAGES,mg)
@$(call set,PID1_BIN,/usr/bin/mg)
distro/elinks: distro/.base use/pid1/net
@$(call add,STAGE1_PACKAGES,elinks)
@$(call set,PID1_BIN,/usr/bin/elinks)
endif # IMAGE_CLASS: distro
ifeq (ve,$(IMAGE_CLASS))

View File

@@ -14,6 +14,8 @@ ve/ldv: ve/bare
@$(call add,BASE_PACKAGES,openssh-blacklist openssh-server)
@$(call add,BASE_PACKAGES,shadow-edit shadow-groups)
ve/docker: ve/.base use/repo; @:
# this should be more or less convenient
ve/generic: ve/base use/repo
@$(call add,BASE_PACKAGES,vim-console etckeeper)

View File

@@ -1,14 +1,26 @@
# virtual machines
ifeq (vm,$(IMAGE_CLASS))
vm/bare: vm/.bare
# NB: interactivesystem pulls in network-config-subsystem anyways
vm/bare: vm/.bare +sysvinit
@$(call add,BASE_PACKAGES,apt)
vm/net: vm/bare use/net-eth/dhcp use/net-ssh
vm/net: vm/bare use/net-eth/dhcp use/net-ssh use/repo use/control/sudo-su
@$(call add,BASE_PACKAGES,su)
# NB: use/x11 employs some installer-feature packages
vm/icewm: vm/net use/cleanup/installer use/repo use/deflogin/altlinuxroot \
use/x11/xorg use/x11/lightdm/gtk use/x11-autologin +icewm; @:
vm/.desktop-bare: vm/net use/x11/xorg use/cleanup/installer use/repo; @:
vm/.desktop-base: vm/.desktop-bare \
use/deflogin/altlinuxroot use/x11-autologin; @:
mixin/icewm: use/x11/lightdm/gtk +icewm; @:
vm/icewm: vm/.desktop-base mixin/icewm; @:
vm/icewm-setup: vm/.desktop-bare mixin/icewm use/oem use/x11-autostart
@$(call set,BRANDING,simply-linux)
@$(call add,THE_BRANDING,graphics)
@$(call add,THE_LISTS,$(call tags,base l10n))
endif

View File

@@ -8,6 +8,9 @@ ifdef DEBUG
VERBOSE = --verbose
endif
# avoid common DEBUG for the time being
-include $(HOME)/.mkimage/profiles.mk
PROJECT = mkimage-profiles
TOPLEVEL_DOC = $(PROJECT).asciidoc
RESOURCE_FILES = /etc/asciidoc
@@ -24,10 +27,22 @@ COMMON_ARGS = -d book -a lang="$L" $(DEST) $(VERBOSE) $(TOPLEVEL_DOC)
HTML_ARGS = -a data-uri --icons -r $(RESOURCE_FILES) -r . \
--xsltproc-opts='$(XSLT_ARGS)' $(COMMON_ARGS)
# most convenient deliverables
DOCS_OUT = $(PROJECT).pdf $(PROJECT).html docbook-xsl.css
# intermediate files
DOCS_TMP = $(PROJECT).fo $(PROJECT).xml
.PHONY: all prep chunked xhtml pdf clean
all: chunked xhtml pdf
# NB: destination defined externally
publish: all
@if [ -n "$(DOCS_PUBLISH)" ]; then \
rsync -qa $(DOCS_OUT) "$(DOCS_PUBLISH)"; \
fi
prep:
@if [ -n "$(BUILDDIR)" ]; then mkdir -p "$(BUILDDIR)"; fi
@@ -46,5 +61,4 @@ pdf: prep
clean:
@echo "** cleaning up"
@if [ -d "$(BUILDDIR)" ]; then cd "$(BUILDDIR)"; fi; \
rm -f $(PROJECT).pdf $(PROJECT).html docbook-xsl.css; \
rm -rf $(PROJECT).chunked/
rm -rf $(DOCS_OUT) $(DOCS_TMP) $(PROJECT).chunked/ .fop.xconf

View File

@@ -4,7 +4,7 @@
других частей mkimage-profiles либо содержание переменных.
NB: пути приводятся от верхнего уровня; проект в целом предполагает
ALT Linux 6.0+ и GNU make 3.81+ (на которых и разрабатывается),
ALT Linux 7.0+ и GNU make 3.82+ (на которых и разрабатывается),
но может быть портирован вместе с mkimage. Если что-либо не работает
или не собирается, стоит проверить на Sisyphus (mkimage, make, hasher,
собственно пакетная база), поскольку именно на нём происходит основная
@@ -27,7 +27,7 @@ ALT Linux 6.0+ и GNU make 3.81+ (на которых и разрабатыва
E: Couldn't find package
* features.in/stage2/stage1/scripts.d/02-kdefault
* features.in/kernel/stage1/scripts.d/80-make-initrd
* features.in/stage2/stage1/scripts.d/03-test-kernel
* sub.in/stage1/Makefile
** ожидают, что в stage1 попадёт строго одно ядро сообразно

View File

@@ -14,7 +14,8 @@
удобно для анализа и обновления (и в отличие от _m-p-d_ -- нет
вынужденной необходимости либо контролировать включение нужных
фич "вручную" в скриптах по косвенным признакам, либо выносить
их в пакеты installer-feature-*).
их в пакеты installer-feature-*); также возможно добиться большей
степени интеграции по данным (например, язык gfxboot и LiveCD).
Создание и упаковку installer-feature-* можно рекомендовать, если:

View File

@@ -10,13 +10,14 @@ mkimage-profiles, или _m-p_ — результат осмысления и о
*Цели*
* пригодность к применению как очень крутыми хакерами, так и новичками
* относительно низкая трудоёмкость использования
* поощрение совместной работы
* относительно низкая трудоёмкость использования
* пригодность к применению как очень крутыми хакерами, так и новичками
*Средства*
Двухуровневость:
* метапрофиль более объёмен и сложен, но выгоден для долгосрочной разработки
* сгенерированный дистрибутивный профиль более легко обозрим и модифицируем как одноразовый форк
* наследственность на уровне индивидуальных особенностей и образов в целом
@@ -25,11 +26,11 @@ mkimage-profiles, или _m-p_ — результат осмысления и о
*Примеры использования*
Выполняем начальные инструкции по документации
Выполняем начальные инструкции по документации:
git clone git://git.altlinux.org/people/mike/packages/mkimage-profiles.git
cd mkimage-profiles
make icewm.iso
make rescue.iso
= Основы =

View File

@@ -6,91 +6,91 @@
* APTCONF
** задаёт путь к требуемому apt.conf
** значение: пусто (по умолчанию системный) либо строка
** см. ../image.in/Makefile, apt.conf.sample
** см. image.in/Makefile, doc/apt.conf.sample
* ARCH
** задаёт целевую архитектуру образов
** значение: пусто (по умолчанию авто), i586, x86_64, arm, ppc
** см. ../lib/build.mk
** см. lib/build.mk
* ARCHES
** задаёт набор целевых архитектур при параметрическом задании APTCONF
** значение: пусто (по умолчанию авто) либо список через пробел
** см. ../Makefile, profiles.mk.sample
** см. Makefile, doc/profiles.mk.sample
* BELL
** подаёт сигнал после завершения сборки
** значение: пусто (по умолчанию нет) либо любая строка
** см. ../lib/build.mk
** см. lib/build.mk
* BUILDDIR
** задаёт каталог генерируемого профиля и сборки
** значение: пусто (по умолчанию авто) либо строка
** см. ../lib/profile.mk
** см. lib/profile.mk
* BUILDDIR_PREFIX
** задаёт префикс каталога генерируемого профиля и сборки
** значение: строка; по умолчанию выбирается алгоритмически
** см. ../main.mk
** см. main.mk
* BUILDLOG
** задаёт путь к файлу журнала сборки/очистки
** значение: по умолчанию $(BUILDDIR)/build.log либо строка
** см. ../lib/log.mk
** значение: $(BUILDDIR)/build.log (по умолчанию) либо строка
** см. lib/log.mk
* CHECK
** включает режим проверки сборки конфигурации (без сборки образа)
** значение: пусто (по умолчанию) либо любая строка
** см. ../lib/build.mk, ../lib/clean.mk
** см. lib/build.mk, lib/clean.mk
* CLEAN
** экономия RAM+swap при сборке в tmpfs, иначе места на диске
** очистка рабочего каталога после успешной сборки очередной стадии
** может помешать использовать некоторые варианты отладки
** значение: пусто, 0, 1, 2; по умолчанию пусто при DEBUG, иначе 1
** см. ../lib/clean.mk
** см. lib/clean.mk
* DEBUG
** включает средства отладки, может отключить зачистку после сборки
** значение: пусто (по умолчанию), 1 или 2
** см. ../lib/log.mk, ../lib/clean.mk
** см. lib/log.mk, lib/clean.mk
* HOMEPAGE, HOMENAME, HOMEWAIT
** указывают адрес, название и таймаут перехода для домашней страницы
** значение: корректный URL, строка, целое неотрицательное число
** см. ../features.in/live/generate.mk (тж. по умолчаниям)
** см. features.in/live/generate.mk (тж. по умолчаниям)
* ISOHYBRID
** включает создание гибриднго ISO-образа
** значение: пусто (по умолчанию) либо любая строка
** см. ../features.in/pack/config.mk
** см. features.in/pack/config.mk, features.in/isohybrid/config.mk
* NICE
** понижает нагрузку системы сборочной задачей
** значение: пусто (по умолчанию) либо любая строка
** см. ../lib/build.mk
** см. lib/build.mk
* REPORT
** запрашивает создание отчётов о собранном образе
** значение: пусто (по умолчанию) либо любая строка
** NB: в силу специфики обработки передаётся только явно
** см. ../Makefile, ../report.mk, ../lib/report.mk
** см. Makefile, report.mk, lib/report.mk
* ROOTPW
** устанавливает пароль root по умолчанию для образов виртуальных машин
** значение: пусто (по умолчанию root) либо строка
** см. ../features.in/build-vm/image-scripts.d/00root
** см. features.in/deflogin/rootfs/image-scripts.d/50-root
* SAVE_PROFILE
** сохраняет архив сгенерированного профиля в .disk/
** значение: пусто (по умолчанию) либо любая строка
** см. ../image.in/Makefile
** см. image.in/Makefile
* SORTDIR
** дополнительно структурирует каталог собранных образов
** значение: пусто (по умолчанию) либо строка
*** например, '$(IMAGE_NAME)/$(DATE)'
** см. ../image.in/Makefile
** см. image.in/Makefile
* SQUASHFS
** определяет характер сжатия squashfs для stage2
@@ -98,18 +98,18 @@
*** пусто (по умолчанию) либо normal: xz
*** tight: xz с -Xbcj по платформе (лучше, но дольше -- подбор в два прохода)
*** fast: gzip/lzo (быстрее запаковывается и распаковывается, меньше степень)
** см. ../features.in/stage2/stage1/scripts.d/03-test-kernel
** см. features.in/stage2/stage1/scripts.d/03-test-kernel
* STATUS
** добавляет в имя образа указанный префикс
** значение:
*** пусто (по умолчанию) либо строка (например, "alpha", "beta")
** см. ../image.in/Makefile
** см. image.in/Makefile
* VM_SIZE
** задаёт размер несжатого образа виртуальной машины в байтах
** значение: пусто (по умолчанию двойной размер чрута) или целое
** см. ../features.in/build-vm/lib/90-build-vm.mk, ../bin/tar2fs
** см. features.in/build-vm/lib/90-build-vm.mk, bin/tar2vm
[float]
=== пример ===

View File

@@ -1,7 +1,7 @@
== Списки пакетов ==
Состав пакетной базы субпрофилей определяется значенями
следующих переменных профиля (см. тж. ../conf.d/README;
Состав пакетной базы субпрофилей определяется значениями
следующих переменных профиля (см. тж. conf.d/README;
некоторые "*" ниже заэкранированы ради парсера asciidoc):
* main: пакетная база для установки
@@ -14,14 +14,14 @@
** THE_KMODULES, BASE_KMODULES, MAIN_KMODULES, BASE_KMODULES_REGEXP
*** KFLAVOURS
* stage2: общая часть installer, live, rescue
* stage2: общая часть install2, live, rescue
** sub.in/stage2/Makefile, features.in/\*/stage2/lib/*.mk
** SYSTEM_PACKAGES, STAGE2_PACKAGES
** STAGE1_KMODULES, STAGE1_KMODULES_REGEXP,
STAGE2_KMODULES, STAGE2_KMODULES_REGEXP
*** STAGE1_KFLAVOUR или последний из KFLAVOURS
* installer: компактная "живая" система, содержащая только инсталятор
* install2: компактная "живая" система, содержащая только инсталятор
** см. stage2
*** features.in/install2/install2/stage2cfg.mk,
features.in/\*/install2/lib/*.mk

View File

@@ -21,12 +21,12 @@
цели в UI конфигурирования образа.
Остальное содержимое является дополнительным и используется
в таком порядке (см. ../Makefile):
в таком порядке (см. features.in/Makefile):
* сперва в $(BUILDDIR)/image/ копируются все подкаталоги,
соответствующие итоговым именам субпрофилей, запрошенных
для профиля образа; при этом они сливаются с деревом,
которое уже сформировано субпрофилями (../sub.in/*) и уже
которое уже сформировано субпрофилями (sub.in/*) и уже
скопированными фичами; если какие-либо файлы перекрылись
по именам, rsync должен оставить резервные копии (*~),
которые должны просигнализировать о беспорядке;

View File

@@ -8,6 +8,6 @@
#
# for somewhat more involved example, see syslinux feature
use/00example: sub/main use/anotherfeature
use/00example: use/repo/main use/anotherfeature
@$(call add_feature)
@$(call add,MAIN_PACKAGES,hello)

View File

@@ -8,14 +8,14 @@
других фич либо субпрофилей.
Каждая фича должна содержать файл config.mk, включаемый
в ../main.mk при построении конфигурации будущего профиля;
в main.mk при построении конфигурации будущего профиля;
он может описывать одну или более целей вида use/*,
дополняющих конфигурацию, и обязан добавить имя фичи
в $(FEATURES), для чего создана функция add_feature.
На этапе генерации сборочного профиля фичи рассматриваются
после инициализации профиля (см. ../image.in/) и копирования
субпрофилей (см. ../sub.in/). Для каждой фичи, указанной
после инициализации профиля (см. image.in/) и копирования
субпрофилей (см. sub.in/). Для каждой фичи, указанной
в $(FEATURES), копируются подкаталоги сообразно включенным
субпрофилям, а также lib/ и {image-,}scripts.d/; затем
выполняются generate.sh и generate.mk при их наличии.

View File

@@ -4,7 +4,7 @@
# the last different one wins
# - remember .base if adding yet another *_PACKAGES
use/bootloader: use/install2 sub/main
use/bootloader:
@$(call add_feature)
@$(call add,BASE_PACKAGES,alterator-$$(BASE_BOOTLOADER))

View File

@@ -0,0 +1,6 @@
#!/bin/sh
if [ -z "$GLOBAL_BASE_BOOTLOADER" ]; then
echo "** error: BASE_BOOTLOADER empty while bootloader feature requested" >&2
exit 1
fi

View File

@@ -4,8 +4,13 @@ use/branding:
# NB: not every distro might have all the branding of its own
use/branding/full: use/branding use/syslinux/ui/gfxboot
@$(call add,THE_BRANDING,alterator bootsplash graphics)
@$(call add,THE_BRANDING,alterator bootloader bootsplash graphics)
@$(call add,THE_BRANDING,indexhtml notes slideshow)
use/branding/complete: use/branding/full use/plymouth/full
@$(call add,INSTALL2_BRANDING,notes slideshow)
# http://altlinux.org/branding/slideshow
use/branding/slideshow/once: use/branding
@$(call add,INSTALL2_BRANDING_SLIDESHOW,once:true)
@$(call xport,INSTALL2_BRANDING_SLIDESHOW)

View File

@@ -0,0 +1,7 @@
#!/bin/bash
[ -n "$GLOBAL_INSTALL2_BRANDING_SLIDESHOW" ] || exit 0
for arg in $GLOBAL_INSTALL2_BRANDING_SLIDESHOW; do
echo "${arg/:/=}" >> /etc/alterator/slideshow.conf
done

View File

@@ -1 +1,2 @@
IMAGE_PACKAGES_REGEXP += $(call branding,$(INSTALL2_BRANDING))
IMAGE_PACKAGES_REGEXP += $(call branding, \
$(STAGE2_BRANDING) $(INSTALL2_BRANDING))

View File

@@ -2,3 +2,6 @@
# NB: this comes just before build-distro.mk
DOT_BASE += $(call branding,$(THE_BRANDING))
CHROOT_PACKAGES_REGEXP += $(call branding,bootloader)
CHROOT_PACKAGES += ImageMagick-tools

View File

@@ -1 +1,2 @@
IMAGE_PACKAGES_REGEXP += $(call branding,$(THE_BRANDING))
IMAGE_PACKAGES_REGEXP += $(call branding, \
$(THE_BRANDING) $(STAGE2_BRANDING))

View File

@@ -1 +0,0 @@
IMAGE_PACKAGES_REGEXP += $(call branding,$(STAGE2_BRANDING))

View File

@@ -0,0 +1,6 @@
Эта фича обеспечивает наличие и конкретизацию выбора браузера.
Разумеется, дополнительные варианты могут быть установлены
явным или косвенным затребованием.
Следует понимать, что каждая из целей может быть использована
лишь один раз, повторное упоминание будет проигнорировано make.

View File

@@ -0,0 +1,38 @@
use/browser:
@$(call add_feature)
@$(call add,THE_PACKAGES_REGEXP,$$(THE_BROWSER))
@$(call try,THE_BROWSER,webclient) # fallback
use/browser/firefox use/browser/seamonkey \
use/browser/chromium use/browser/epiphany \
use/browser/qupzilla use/browser/rekonq \
use/browser/elinks use/browser/links2: \
use/browser/%: use/browser
@$(call set,THE_BROWSER,$*)
use/browser/konqueror: use/browser
@$(call set,THE_BROWSER,kdebase-konqueror)
use/browser/konqueror4: use/browser
@$(call set,THE_BROWSER,kde4base-konqueror)
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)
# fx29+
use/browser/firefox/classic: use/browser/firefox
@$(call add,THE_BROWSER,firefox-classic_theme_restorer.*)
use/browser/seamonkey/i18n: use/browser/seamonkey
@$(call add,THE_BROWSER,seamonkey-ru)
# inherently insecure, NPAPI only
use/browser/plugin/flash: use/browser
@$(call add,THE_PACKAGES,mozilla-plugin-adobe-flash)
use/browser/plugin/java: use/browser
@$(call add,THE_PACKAGES,mozilla-plugin-java-1.6.0-sun)

View File

@@ -3,3 +3,9 @@
Дополняет финальную стадию сборки (lib/, scripts.d/)
и тесно с ней связана.
При желании более полно воспользоваться доступными средствами
фиксации метаданных обратите внимание на следующие переменные:
META_SYSTEM_ID, META_PUBLISHER, META_PREPARER, META_APP_ID,
META_VOL_ID, META_VOL_SET, META_BIBLIO, META_ABSTRACT;
см. тж. genisoimagerc(5) из пакета genisoimage.

View File

@@ -1,3 +1,3 @@
# hooked from ../../lib/sugar.mk
# hooked from lib/sugar.mk
use/build-distro:
@$(call add_feature)

View File

@@ -1,3 +1,3 @@
# hooked from ../../lib/sugar.mk
# hooked from lib/sugar.mk
use/build-ve: sub/rootfs@/
@$(call add_feature)

View File

@@ -1,3 +1,3 @@
Эта фича конфигурирует создание образа виртуальной машины (VM).
Дополняет финальную стадию сборки (lib/, image-scripts.d/).
Требует для работы sudo(8) -- см. тж. ../../doc/vm.txt .
Требует для работы sudo(8) -- см. тж. doc/vm.txt

View File

@@ -1,3 +1,3 @@
# hooked from ../../lib/sugar.mk
use/build-vm: sub/rootfs@/ use/kernel use/deflogin
# hooked from lib/sugar.mk
use/build-vm: sub/rootfs@/ use/kernel
@$(call add_feature)

View File

@@ -1,6 +1,6 @@
#!/bin/sh
# predictable file locations make bootloader configuration simple;
# this script relates to .../features.in/stage2/stage1/scripts.d/80-make-initfs
# this script relates to features.in/stage2/stage1/scripts.d/80-make-initfs
kver="$(rpm -qa 'kernel-image*' \
--qf '%{installtime} %{version}-%{name}-%{release}\n' \

View File

@@ -1,4 +1,8 @@
Эта фича конфигурирует root login и пользователей по умолчанию.
Если ROOTPW не задан, то подходящий пароль не существует.
При необходимости задать пустой пароль root (например, на LiveCD)
выставьте переменную ROOTPW_EMPTY в значение "1".
ВНИМАНИЕ: применяйте разумно, т.к. крайне легко создать и оставить
дыру в безопасности!

View File

@@ -2,6 +2,7 @@
use/deflogin:
@$(call add_feature)
@$(call add,THE_PACKAGES,shadow-utils passwd)
@$(call xport,ROOTPW_EMPTY)
@$(call xport,ROOTPW)
@$(call xport,USERS)
@$(call xport,GROUPS)
@@ -10,20 +11,31 @@ use/deflogin:
# USERS variable chunk format is "login:passwd:admin:sudo"
# GROUPS are just stashed there to include USERS logins created
# livecd: root and altlinux users with no password at all
use/deflogin/empty: use/deflogin use/deflogin/altlinux
@$(call set,ROOTPW,)
# basic livecd: root and altlinux users with no password at all
use/deflogin/live: use/deflogin
@$(call set,ROOTPW_EMPTY,1)
@$(call add,USERS,altlinux::1:1)
# mostly used to allow access to videocard and desktop related hardware
use/deflogin/xgrp: use/deflogin
@$(call add,GROUPS,xgrp)
# appliances: "root:altlinux"; "altlinux:root" in "xgrp" group
use/deflogin/altlinuxroot: use/deflogin/xgrp
@$(call try,ROOTPW,altlinux)
@$(call add,USERS,altlinux:root:1:1)
# real thing: some control added
use/deflogin/desktop: use/deflogin/live \
use/deflogin/hardware use/deflogin/xgrp use/deflogin/privileges; @:
# could also be passed on the commandline
use/deflogin/root: use/deflogin
@$(call try,ROOTPW,altlinux)
# appliances: "root:altlinux"; "altlinux:root" in "xgrp" group
use/deflogin/altlinuxroot: use/deflogin/root use/deflogin/xgrp
@$(call add,USERS,altlinux:root:1:1)
# peripherals
use/deflogin/hardware: use/deflogin
@$(call add,GROUPS,cdwriter radio scanner uucp)
# videocard and desktop related hardware
use/deflogin/xgrp: use/deflogin
@$(call add,GROUPS,xgrp audio)
# potentially elevated privileges (NB: _not_ wheel)
use/deflogin/privileges: use/deflogin
@$(call add,GROUPS,fuse netadmin proc users)

View File

@@ -0,0 +1,20 @@
#!/bin/sh
# issue welcome message if there's a guest user
# (the first one configured with empty password)
[ -n "$GLOBAL_USERS" ] || exit 1
guest=
for u in $GLOBAL_USERS; do
login="${u%%:*}"
[ -n "$login" ] || continue
rest="${u#*:}"
pass="${rest%%:*}"
[ -z "$pass" ] || continue
guest="$login"
break
done
[ -n "$guest" ] || exit 0
echo "Hello friend, say \`$guest' to log in at \\l" >> /etc/issue

View File

@@ -1,10 +1,16 @@
#!/bin/sh
# set root password if any; no-op if it is unset
test="${GLOBAL_ROOTPW=:unset}"
# explicitly requested empty root password
case "$GLOBAL_ROOTPW_EMPTY" in
1|y|Y|yes)
usermod -p "" root
exit 0
;;
esac
if [ "$test" = ":unset" ]; then
echo "** warning: no root password provided, you're on your own" >&2
# set root password if any; no-op if it is empty
if [ -z "$GLOBAL_ROOTPW" ]; then
echo "** warning: no root password provided, skipping" >&2
else
echo "$GLOBAL_ROOTPW" | passwd --stdin root
fi

View File

@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/sh
# add regular user(s) assigning passwords and attributes of power
# NB: care that the utilities exist; shadow-utils is warranted
@@ -6,8 +6,10 @@
add_user() {
useradd -m "$1" &&
usermod -p "" "$1" &&
if [ -n "$GLOBAL_GROUPS" ]; then
usermod -a --groups "${GLOBAL_GROUPS// /,}" "$1" # bashism
if [ -n "$GLOBAL_GROUPS" ]; then # some of them might be missing
for group in $GLOBAL_GROUPS; do
usermod -a --groups "$group" "$1" ||:
done
fi ||
echo "*** failed to add user '$1'"
}
@@ -21,7 +23,7 @@ set_sudo() {
echo "$1 ALL=(ALL) ALL" >> "/etc/sudoers"
}
# chpasswd is inteded for batch use but that would be less comprehensible
# chpasswd is intended for batch use but that would be less comprehensible
[ -z "$GLOBAL_USERS" ] ||
echo "$GLOBAL_USERS" \
| tr ' ' '\n' \

View File

@@ -39,5 +39,8 @@ ln -s "$TMP/hasher" "$HOME/hasher"
echo "export share_network=1" >> /etc/profile.d/hasher.sh
chmod +x /etc/profile.d/hasher.sh
# squashfs-tools 4.3+
echo "allowed_mountpoints=/proc" >> /etc/hasher-priv/system
# requisite
hasher-useradd "$USER"

View File

@@ -1,3 +1,7 @@
Эта фича конфигурирует поддержку клиента домена ALT Linux.
NB: не проверена на инсталяторах!
krb5-ticket-watcher применяется для отладки либо обновления
билетов при нехватке сконфигурированного по умолчанию (сутки)
либо указанного администратором времени жизни таковых.
NB: не проверено на инсталяторах!

View File

@@ -1,4 +1,7 @@
use/domain-client: use/net/dhcp
@$(call add_feature)
@$(call add,THE_LISTS,domain-client)
use/domain-client/full: use/domain-client
@$(call add,THE_PACKAGES,krb5-ticket-watcher)
@$(call add,DEFAULT_SERVICES_ENABLE,avahi-daemon)

View File

@@ -2,7 +2,7 @@
Конфигурируется заданием загрузчика (EFI_BOOTLOADER)
и файла сертификата (EFI_CERT) при помощи целей;
пример использования доступен в ../../conf.d/regular.mk
пример использования доступен в conf.d/regular.mk
См. тж.:
* http://www.altlinux.org/UEFI

View File

@@ -1,4 +1,4 @@
+efi: use/efi; @:
+efi: use/efi/signed; @:
ifeq (x86_64,$(ARCH))
@@ -6,28 +6,29 @@ EFI_LISTS := $(call tags,base efi)
use/efi:
@$(call add_feature)
@$(call set,MKI_VER_MINIMAL,0.2.5) # see #28219
@$(call set,MKI_VER_MINIMAL,0.2.12) # it's official now
@$(call add,THE_LISTS,$(EFI_LISTS))
@$(call add,RESCUE_LISTS,$(EFI_LISTS))
@$(call add,THE_PACKAGES,$$(EFI_SHELL))
@$(call add,RESCUE_PACKAGES,refind $$(EFI_SHELL))
@$(call add,INSTALL2_PACKAGES,dosfstools fatresize)
@$(call try,EFI_BOOTLOADER,elilo) # default one
@$(call add,STAGE1_KCONFIG,EFI EFI_PARTITION EFI_VARS FB_EFI)
use/efi/refind: use/efi
@$(call set,EFI_BOOTLOADER,refind)
use/efi/signed: use/efi
@$(call set,MKI_VER_MINIMAL,0.2.7) # refind->elilo handoff
@$(call set,EFI_CERT,altlinux)
@$(call add,THE_PACKAGES,shim-signed)
@$(call set,EFI_SHELL,efi-shell-signed) # even more useful
@$(call add,RESCUE_PACKAGES,refind-signed)
@$(call add,RESCUE_PACKAGES,openssl sbsigntools)
@$(call add,RESCUE_PACKAGES,openssl pesign sbsigntools)
use/efi/shell: use/efi
@$(call try,EFI_SHELL,efi-shell)
use/efi/memtest86: use/efi/refind
@$(call set,EFI_MEMTEST86,efi-memtest86)
use/efi/debug: use/efi
@$(call add,STAGE2_PACKAGES,efibootmgr gdisk)
@$(call set,KFLAVOURS,led-ws)
@@ -35,6 +36,7 @@ use/efi/debug: use/efi
else
# ignore on an unsupported target arch but make it hybrid at least
use/efi use/efi/refind use/efi/signed use/efi/shell use/efi/debug: use/isohybrid
use/efi use/efi/signed use/efi/debug \
use/efi/refind use/efi/shell use/efi/memtest86: use/isohybrid
endif

View File

@@ -18,15 +18,10 @@ use/firmware/server: use/firmware
# NB: individual firmwarez would sometimes conflict
# with ones newly merged into firmware-linux
# FIXME: kernel modules rather belong to use/hardware
use/firmware/wireless: use/firmware
@$(call add,THE_KMODULES,bcmwl ndiswrapper)
use/firmware/wireless: use/firmware use/kernel/wireless
@$(call add,THE_PACKAGES,firmware-acx100)
@#$(call add,THE_PACKAGES,firmware-i2400m)
@#$(call add,THE_PACKAGES_REGEXP,firmware-carl9170.*)
@$(call add,THE_PACKAGES_REGEXP,firmware-prism.*)
@$(call add,THE_PACKAGES_REGEXP,firmware-ipw.*)
@#$(call add,THE_PACKAGES_REGEXP,firmware-iwl.*)
@#$(call add,THE_PACKAGES_REGEXP,firmware-rt.*)
@$(call add,THE_PACKAGES_REGEXP,firmware-zd.*)
use/firmware/laptop: use/firmware/wireless use/firmware/cpu

View File

@@ -1,3 +1,4 @@
# fontconfig setup
use/fonts:
@$(call add_feature)
@$(call xport,FONT_FEATURES_ENABLE)
@@ -13,3 +14,30 @@ use/fonts/zerg: use/fonts
# nothing configured to add_feature but let's not skip that for consistency
use/fonts/infinality: use/fonts
@$(call add,THE_PACKAGES,libfreetype-infinality fontconfig-infinality)
# a few typical font collections
# NB: dejavu is ugly thus missing
# NB: not depending on use/fonts intentionally,
# the scripts are unneeded to add packages
use/fonts/otf/adobe:
@$(call add,THE_PACKAGES,fonts-otf-adobe-source-code-pro)
@$(call add,THE_PACKAGES,fonts-otf-adobe-source-sans-pro)
use/fonts/otf/mozilla:
@$(call add,THE_PACKAGES,fonts-otf-mozilla-fira)
use/fonts/ttf/google:
@$(call add,THE_PACKAGES,fonts-ttf-droid)
@$(call add,THE_PACKAGES,fonts-ttf-google-croscore-arimo)
@$(call add,THE_PACKAGES,fonts-ttf-google-croscore-cousine)
@$(call add,THE_PACKAGES,fonts-ttf-google-croscore-tinos)
use/fonts/ttf/google/extra: use/fonts/ttf/google
@$(call add,THE_PACKAGES,fonts-ttf-google-crosextra-caladea)
@$(call add,THE_PACKAGES,fonts-ttf-google-crosextra-carlito)
use/fonts/ttf/redhat:
@$(call add,THE_PACKAGES,fonts-ttf-liberation)
use/fonts/ttf/ubuntu:
@$(call add,THE_PACKAGES,fonts-ttf-ubuntu-font-family)

View File

@@ -1,11 +1,7 @@
use/homeros: use/control/sudo-su use/services
@$(call add_feature)
# @$(call set,BRANDING,simply-linux)
# @$(call add,THE_BRANDING,menu xfce-settings)
@$(call add,THE_LISTS,homeros/voiceman)
@$(call add,THE_LISTS,homeros/homeros)
@$(call add,THE_LISTS,homeros/tts)
@$(call add,THE_LISTS,homeros/yasr)
@$(call add,THE_LISTS,homeros/tools)
# @$(call set,META_VOL_SET,Homeros)
@$(call add,DEFAULT_SERVICES_ENABLE,sshd voiceman)
@$(call add,DEFAULT_SERVICES_ENABLE,sshd)

View File

@@ -1,13 +0,0 @@
#!/bin/sh
cat <<EOF > /etc/rc.d/rc.local
#!/bin/sh
amixer set Master 75%
amixer set Master toggle
amixer set PCM 75%
amixer set PCM toggle
EOF
chmod 755 /etc/rc.d/rc.local

View File

@@ -1,4 +0,0 @@
#!/bin/sh -e
/bin/ln -s /etc/tts.d/rhvoice-en.voiceman /etc/voiceman.d/rhvoice-en.output
/bin/ln -s /etc/tts.d/rhvoice.voiceman /etc/voiceman.d/rhvoice.output

View File

@@ -10,8 +10,10 @@ use/init:
use/init/sysv: use/init
@$(call set,INIT_TYPE,sysvinit)
@$(call add,BASE_PACKAGES,syslogd)
@$(call add,BASE_PACKAGES_REGEXP,^systemd- ^systemd-services-)
### i-f should be dropped as soon as rootfs scripts are effective there
use/init/systemd: use/init
@$(call set,INIT_TYPE,systemd)
@$(call add,BASE_PACKAGES,installer-feature-systemd-stage3)
@$(call add,BASE_PACKAGES,installer-feature-journald-tty)

View File

@@ -11,3 +11,10 @@
поскольку это прямо влияет на требования по минимальному размеру
оперативной памяти для установки (если не задействован параметр
загрузки ядра lowmem, обрабатываемый propagator).
При необходимости принудительно удалить что-либо из попавшего
в образ инсталятора (вместе с "оптовым" пакетом либо по зависимостям,
когда точно известно, что для данного применения они избыточны) можно
воспользоваться переменной INSTALL2_CLEANUP_PACKAGES для указания
списка пакетов на удаление без учёта зависимостей перед формированием
squashfs и INSTALL2_CLEANUP_KDRIVERS для удаления излишних модулей ядра.

View File

@@ -2,22 +2,33 @@
+installer: use/install2/full; @:
use/install2: use/stage2 sub/stage2@install2 use/metadata use/cleanup/installer
use/install2: use/stage2 sub/stage2@install2 use/metadata \
use/cleanup/installer use/bootloader
@$(call add_feature)
@$(call try,INSTALLER,altlinux-generic) # might be replaced later
@$(call add,INSTALL2_PACKAGES,installer-distro-$$(INSTALLER)-stage2)
@$(call add,INSTALL2_PACKAGES,branding-$$(BRANDING)-alterator)
@$(call add,BASE_PACKAGES,branding-$$(BRANDING)-release)
@$(call add,BASE_PACKAGES,installer-common-stage3)
@$(call add,BASE_LISTS,$(call tags,basesystem))
@$(call xport,BASE_BOOTLOADER)
@$(call xport,INSTALL2_CLEANUP_PACKAGES)
@$(call xport,INSTALL2_CLEANUP_KDRIVERS)
# doesn't use/install2/fs on purpose (at least so far)
use/install2/full: use/install2/packages use/install2/kms use/install2/kvm \
use/install2/full: use/install2/packages use/install2/kms use/install2/vmguest \
use/syslinux/localboot.cfg use/syslinux/ui/menu; @:
# see also use/vmguest
use/install2/vmguest: use/install2/kvm use/install2/vbox use/install2/vmware; @:
# stash local packages within installation media
use/install2/packages: use/install2 use/repo/main; @:
# set up remote repositories within installed system out-of-box
use/install2/repo: use/install2
@$(call add,INSTALL2_PACKAGES,installer-feature-online-repo)
# for alterator-pkg to use
use/install2/net: use/install2
@$(call add,INSTALL2_PACKAGES,curl)
@@ -30,14 +41,90 @@ use/install2/kms: use/stage2/kms
use/install2/kvm:
@$(call add,INSTALL2_PACKAGES,spice-vdagent xorg-drv-qxl)
# virtualbox guest support for installer
use/install2/vbox:
@$(call add,STAGE1_KMODULES,virtualbox-addition vboxguest)
# see also use/vmguest/vmware
use/install2/vmware:
@$(call add,STAGE1_KMODULES,vmware)
@$(call add,STAGE1_KMODULES,scsi) # mptspi in led-ws
@$(call add,INSTALL2_PACKAGES,xorg-drv-vmware)
# NB: sort of conflicts with use/install2/cleanup/vnc
use/install2/vnc:
@$(call add,INSTALL2_PACKAGES,x11vnc)
# filesystems handling
use/install2/fs: use/install2/xfs use/install2/jfs use/install2/reiserfs; @:
use/install2/xfs:
@$(call add,INSTALL2_PACKAGES,xfsprogs)
@$(call add,SYSTEM_PACKAGES,xfsprogs)
use/install2/jfs:
@$(call add,INSTALL2_PACKAGES,jfsutils)
@$(call add,SYSTEM_PACKAGES,jfsutils)
use/install2/reiserfs:
@$(call add,INSTALL2_PACKAGES,reiserfsprogs)
@$(call add,SYSTEM_PACKAGES,reiserfsprogs)
# when VNC installation is less welcome than a few extra megs
use/install2/cleanup/vnc:
@$(call add,INSTALL2_CLEANUP_PACKAGES,x11vnc xorg-xvfb)
# conflicts with luks feature
use/install2/cleanup/crypto:
@$(call add,INSTALL2_CLEANUP_PACKAGES,gnupg libgpg-error)
@$(call add,INSTALL2_CLEANUP_PACKAGES,libgcrypt* libgnutls*)
# leave only cirrus, fbdev, qxl, vesa in vm-targeted images
use/install2/cleanup/x11-hwdrivers:
@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-ati xorg-drv-intel)
@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-glamor)
@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-mach64 xorg-drv-mga)
@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-nouveau xorg-drv-nv)
@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-openchrome)
@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-r128 xorg-drv-radeon)
@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-s3virge xorg-drv-savage)
@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-sis)
# massive purge of anything not critical to installer boot (l10n included!)
use/install2/cleanup/everything: use/install2/cleanup/x11-hwdrivers \
use/install2/cleanup/vnc use/install2/cleanup/crypto
@$(call add,INSTALL2_CLEANUP_PACKAGES,glibc-gconv-modules glibc-locales)
@$(call add,INSTALL2_CLEANUP_PACKAGES,libX11-locales alterator-l10n)
@$(call add,INSTALL2_CLEANUP_PACKAGES,kbd-data kbd console-scripts)
@$(call add,INSTALL2_CLEANUP_PACKAGES,shadow-convert)
@$(call add,INSTALL2_CLEANUP_PACKAGES,libXaw xmessage xconsole)
@$(call add,INSTALL2_CLEANUP_PACKAGES,libncurses libncursesw) # top
@$(call add,INSTALL2_CLEANUP_PACKAGES,openssl) # net-functions
@$(call add,INSTALL2_CLEANUP_PACKAGES,vitmp vim-minimal)
@$(call add,INSTALL2_CLEANUP_PACKAGES,udev-hwdb pciids)
# this conflicts with efi (which needs efivars.ko)
use/install2/cleanup/kernel/firmware:
@$(call add,INSTALL2_CLEANUP_KDRIVERS,kernel/drivers/firmware/)
# drop drivers expected to be useless in virtual environment
use/install2/cleanup/kernel/non-vm:
@$(call add,INSTALL2_CLEANUP_KDRIVERS,kernel/drivers/firewire/)
@$(call add,INSTALL2_CLEANUP_KDRIVERS,kernel/drivers/net/bonding/)
@$(call add,INSTALL2_CLEANUP_KDRIVERS,kernel/drivers/net/ppp/)
@$(call add,INSTALL2_CLEANUP_KDRIVERS,kernel/drivers/net/slip/)
@$(call add,INSTALL2_CLEANUP_KDRIVERS,kernel/drivers/net/team/)
@$(call add,INSTALL2_CLEANUP_KDRIVERS,kernel/drivers/net/usb/)
@$(call add,INSTALL2_CLEANUP_KDRIVERS,kernel/drivers/platform/)
@$(call add,INSTALL2_CLEANUP_KDRIVERS,kernel/drivers/tty/serial/)
@$(call add,INSTALL2_CLEANUP_KDRIVERS,kernel/net/bridge/)
@$(call add,INSTALL2_CLEANUP_KDRIVERS,kernel/net/openvswitch/)
# this would need extra handling anyways
use/install2/cleanup/kernel/storage:
@$(call add,INSTALL2_CLEANUP_KDRIVERS,kernel/drivers/block/aoe/)
@$(call add,INSTALL2_CLEANUP_KDRIVERS,kernel/drivers/block/drbd/)
# burn it down
use/install2/cleanup/kernel/everything: \
use/install2/cleanup/kernel/storage \
use/install2/cleanup/kernel/non-vm \
use/install2/cleanup/kernel/firmware
@$(call add,INSTALL2_CLEANUP_KDRIVERS,kernel/drivers/ata/pata_*)

View File

@@ -1,6 +1,7 @@
#!/bin/sh
# purge anything unused during installation
rm -rf /usr/include
rm -rf /usr/share/icons/{hicolor,large,mini}
# PAM plugins
@@ -15,19 +16,23 @@ rm -rf /usr/share/qt4/{doc,mkspecs,phrasebooks}
rm -rf /usr/share/guile/*/{*.txt,scripts}
rm -rf /usr/share/awk/
# and no systemd either
[ -L /sbin/init ] || rm -rf /lib/systemd/system
### could it be handled with any grace?
### TODO: x11vnc, xorg-xvfb: fix installer-common-stage2
rpmquery -a cpp\* gcc\* perl-base file ipv6calc \
rpmquery -a common-licenses \
cpp\* gcc\* perl-base file ipv6calc \
bind-utils libbind \
libmpfr\* libmpc\* \
libsoup\* \
libGL glxinfo xdriinfo \
make make-initrd x11vnc xorg-xvfb \
libwayland\* libgbm \
libGL libEGL glxinfo xdriinfo \
xdg-utils xterm \
mkfontscale mkfontdir \
make make-initrd \
| xargs -r rpmi -e --nodeps --
### TODO: unless LUKS luks feature is requested we can also drop
### gnupg libgcrypt libgnutls\* libgpg-error
rpmquery -a bind-utils libbind \
rpmquery -a libisl\* libcloog-isl\* \
| xargs -r rpmi -e --
:

View File

@@ -1,15 +1,27 @@
#!/bin/sh
# drop extra drivers et al, purge kernel image(s)
# xorg modules
# xorg-dri-*
rm -r /usr/lib*/X11/modules/dri
# no movies during installation so far
rm -rf /usr/lib*/vdpau/ /usr/lib*/libXv*
# evms modules; see http://evms.sourceforge.net/user_guide/
rm -f /lib*/evms/*/{bbr,csm,drivelink,ogfs,replace,snapshot}*
# unneeded kernel modules
### some of these removals belong to a purge grade script
### TODO: mostly scsi-less and net-less cleanup for antique
## dynamic part
if [ -n "$GLOBAL_INSTALL2_CLEANUP_KDRIVERS" ]; then
for i in $GLOBAL_INSTALL2_CLEANUP_KDRIVERS; do
rm -rf /lib/modules/*/"$i"
done
fi
## static part
rm -rf /lib/modules/*/kernel/arch
rm -rf /lib/modules/*/kernel/drivers/atm
rm -rf /lib/modules/*/kernel/drivers/bluetooth
@@ -17,7 +29,6 @@ rm -rf /lib/modules/*/kernel/drivers/char/{ipmi,hw_random,mwave,tpm}
rm -rf /lib/modules/*/kernel/drivers/char/watchdog
rm -rf /lib/modules/*/kernel/drivers/cpufreq
rm -rf /lib/modules/*/kernel/drivers/edac
#rm -rf /lib/modules/*/kernel/drivers/firmware ### EFI
rm -rf /lib/modules/*/kernel/drivers/gpio
rm -rf /lib/modules/*/kernel/drivers/hwmon
rm -rf /lib/modules/*/kernel/drivers/infiniband ###

View File

@@ -1,6 +1,9 @@
#!/bin/sh
# drop unused l10n/i18n data
# preparations
rpm -e --nodeps glib2-locales
# the fell swoop
find /usr/share/locale/ -type f \! -name 'alterator*' -delete
rm -rf /usr/share/zoneinfo/{posix,right}/
@@ -12,10 +15,10 @@ rm -f /usr/lib*/gconv/BIG5*
rm -f /usr/lib*/gconv/EBCDIC*
# en_* variations
rm -rf /usr/{lib,share}/locale/en_[^U]*
rm -rf /usr/{lib,share{,/X11}}/locale/en_[^U]*
# mods
rm -rf /usr/{lib,share}/locale/*@*
rm -rf /usr/{lib,share{,/X11}}/locale/*@*
# non-utf8 locales
find /usr/lib/locale -mindepth 1 -maxdepth 1 -type d \! -name '*.utf8' -print0 |

View File

@@ -0,0 +1,8 @@
#!/bin/sh
# this relates to install2 feature's cleanup script and executes later
[ -n "$GLOBAL_INSTALL2_CLEANUP_PACKAGES" ] || exit 0
rpmquery -a $GLOBAL_INSTALL2_CLEANUP_PACKAGES |
xargs -r rpmi -e --nodeps --
:

View File

@@ -5,7 +5,7 @@
Можно указать в цепочке зависимостей дистрибутива явно с тем,
чтобы гарантировать гибридный вид образа, либо запросить включение
этой фичи при сборке конфигурации произвольного дистрибутива
(ISOHYBRID=1, см. ../pack/config.mk).
(ISOHYBRID=1, см. features.in/pack/config.mk).
Обратите внимание: в propagator до 20101130-alt15 поддержка
автоматической загрузки с флэш-носителя, содержащего ISO-образ,

View File

@@ -1,3 +1,4 @@
Эта фича конфигурирует внедрение контрольной суммы в образ
инсталятора после его сборки с целью проверки целостности
на ранней стадии установки.
Эта фича конфигурировала экспериментальную проверку целостности носителя;
в настоящее время является устаревшей, см. features.in/mediacheck
# TODO: DROP

View File

@@ -1,3 +1,2 @@
use/isomd5sum:
@$(call add_feature)
@$(call add,POSTPROCESS_TARGETS,90isomd5sum)
use/isomd5sum: use/mediacheck
@$(warning deprecated, see mediacheck feature)

View File

@@ -9,5 +9,10 @@ use/kernel:
@$(call add_feature)
@$(call set,KFLAVOURS,std-def)
# r8168 is a kludge, never install it by default
use/kernel/net:
@$(call add,THE_KMODULES,e1000e igb r8168 rtl8168)
@$(call add,THE_KMODULES,e1000e igb)
@$(call add,MAIN_KMODULES,r8168 rtl8168)
use/kernel/wireless:
@$(call add,THE_KMODULES,bcmwl ndiswrapper)

View File

@@ -2,5 +2,5 @@
# take care for kernel bits
DOT_BASE += $(call kpackages, \
$(THE_KMODULES) $(BASE_KMODULES) $(BASE_KMODULES_REGEXP), \
$(KFLAVOURS))
$(KFLAVOURS), \
$(THE_KMODULES) $(BASE_KMODULES) $(BASE_KMODULES_REGEXP))

View File

@@ -1,6 +1,5 @@
#!/bin/sh
# prepare base make-initrd configuration for stage1
# see also http://www.altlinux.org/Make-initrd-propagator
MAKE_INITRD_VER="`make-initrd -V \
| sed -rn 's/^make-initrd version ([0-9.]+)/\1/p'`"
@@ -10,5 +9,3 @@ if [ "`rpmvercmp "$MAKE_INITRD_VER" "0.8.1"`" != "-1" ]; then
else
sed -i 's/AUTODETECT/#&/' /etc/initrd.mk # see also #28578
fi
echo 'FEATURES += propagator' >> /etc/initrd.mk

View File

@@ -1,7 +1,7 @@
#!/bin/sh -efux
# NB: /etc/initrd.mk carefully prepared by earlier scripts
verbose() { [ -z "$GLOBAL_VERBOSE" ] || echo "** 80-make-initfs: $@" >&2; }
fatal() { echo "** error: $@" >&1; exit 1; }
kver="$(rpm -qa 'kernel-image*' \
--qf '%{installtime} %{version}-%{name}-%{release}\n' \
@@ -10,6 +10,9 @@ kver="$(rpm -qa 'kernel-image*' \
| cut -f 2 -d ' ' \
| sed 's/kernel-image-//')"
[ -n "$kver" ] ||
fatal "no kernel version identified"
MAKE_INITRD_OPTS="--no-checks -k $kver"
MAKE_INITRD_VER="`make-initrd -V \
| sed -rn 's/^make-initrd version ([0-9.]+)/\1/p'`"
@@ -19,17 +22,16 @@ if [ "`rpmvercmp "$MAKE_INITRD_VER" "0.7.8"`" != "-1" ]; then
MAKE_INITRD_OPTS="$MAKE_INITRD_OPTS --no-depmod"
fi
[ -z "$GLOBAL_VERBOSE" ] || MAKE_INITRD_OPTS="$MAKE_INITRD_OPTS -v"
[ -z "$GLOBAL_VERBOSE" ] ||
MAKE_INITRD_OPTS="$MAKE_INITRD_OPTS -v"
if make-initrd $MAKE_INITRD_OPTS; then
pdir="$(getconf LIBDIR)/propagator"
mkdir -p "$pdir"
gzip < /boot/initrd-$kver.img > "$pdir"/initfs
else
verbose "make-initrd failed"
exit 1
fi
make-initrd $MAKE_INITRD_OPTS ||
fatal "make-initrd failed"
[ -h /boot/vmlinuz ] ||
ln -s vmlinuz-$kver /boot/vmlinuz
[ -h /boot/initrd.img ] ||
ln -s initrd-$kver.img /boot/initrd.img
[ -h /boot/vmlinuz ] || ln -s vmlinuz-$kver /boot/vmlinuz
[ -h /boot/initrd.img ] || ln -s initrd-$kver.img /boot/initrd.img
:

1
features.in/l10n/README Normal file
View File

@@ -0,0 +1 @@
Эта фича занимается поддержкой локализации (l10n).

View File

@@ -0,0 +1,37 @@
# install locales
# setup locale
# setup console keyboard (kbd)
# setup X11 keyboard (xkb)
# install/setup additional packages
# TODO: KEYMAP for default keymap?
use/l10n:
@$(call add_feature)
@$(call add,STAGE2_BOOTARGS,lang=$$(LOCALE))
@$(call add,THE_PACKAGES,glibc-locales)
@$(call add,LOCALES,en_US)
@$(call add,XKB_KEYMAPS,us)
@$(call xport,LOCALE)
@$(call xport,LOCALES)
@$(call xport,XKB_KEYMAPS)
@$(call xport,XKB_VARIANTS)
@$(call xport,XKB_SWITCH)
@$(call xport,XKB_LED)
# see also alterator-sysconfig backend
use/l10n/xkb/switch/ctrl_shift: use/l10n
@$(call set,XKB_SWITCH,grp:ctrl_shift_toggle)
use/l10n/xkb/led/scroll: use/l10n
@$(call set,XKB_LED,grp_led:scroll)
# FIXME: derive from locale by default if possible
use/l10n/ru_RU: use/l10n/xkb/switch/ctrl_shift use/l10n/xkb/led/scroll
@$(call add,LOCALES,ru_RU)
@$(call set,LOCALE,ru_RU)
@$(call add,XKB_KEYMAPS,ru)
@$(call set,KEYTABLE,ruwin_ct_sh-UTF-8)
# NB: BOOT_LANG is used within mkimage internally
use/l10n/default/ru_RU: use/l10n/ru_RU
@$(call set,GLOBAL_BOOT_LANG,ru_RU)

View File

@@ -0,0 +1,17 @@
#!/bin/sh
# partial port of livecd-setlocale (kbd bits)
CONFIG=/etc/sysconfig/keyboard
# Requires: console-scripts
if [ -s "$CONFIG" ]; then
echo "** l10n-kbd: expected $CONFIG to be an empty file" >&2
exit 0
fi
if [ -z "$GLOBAL_KEYTABLE" ]; then
echo "** l10n-kbd: empty GLOBAL_KEYTABLE" >&2
exit 0
fi
echo "KEYTABLE=$GLOBAL_KEYTABLE" > "$CONFIG"

View File

@@ -0,0 +1,19 @@
#!/bin/sh
# partial port of livecd-setlocale (xkb bits)
PREFIX=/etc/X11/xinit
# Requires: xinitrc
if [ ! -d "$PREFIX" ]; then
echo "** l10n-xkb: expected $PREFIX to exist (xinitrc)" >&2
exit 0
fi
if [ -z "$GLOBAL_XKB_VARIANTS" -o -z "$GLOBAL_XKB_KEYMAPS" ]; then
echo "** l10n-xkb: empty GLOBAL_XKB_VARIANTS/GLOBAL_XKB_KEYMAPS" >&2
exit 0
fi
echo "-option $GLOBAL_XKB_SWITCH${GLOBAL_XKB_LED:+,$GLOBAL_XKB_LED} \
${GLOBAL_XKB_VARIANTS:+-variant $GLOBAL_XKB_VARIANTS} \
-layout $GLOBAL_XKB_KEYMAPS" > "$PREFIX"/Xkbmap

View File

@@ -0,0 +1,15 @@
# supplement live with keyboard layout setup
XKB_KEYMAPS := $(subst $(SPACE),$(COMMA),$(XKB_KEYMAPS))
# handle the layouts with a specific variant in the wild
XKB_VARIANTS := $(subst ru,winkeys, \
$(subst ua,winkeys, \
$(subst be,winkeys, \
$(subst us,,$(XKB_KEYMAPS)))))
debug::
@echo "** live: LOCALES: $(LOCALES)"
@echo "** live: LOCALE: $(LOCALE)"
@echo "** live: XKB_KEYMAPS: $(XKB_KEYMAPS)"
@echo "** live: XKB_VARIANTS: $(XKB_VARIANTS)"

View File

@@ -1,12 +1,26 @@
+live: use/live/desktop; @:
# service defaults
_ON = alteratord cpufreq-simple \
livecd-evms livecd-fstab livecd-hostname \
livecd-setauth livecd-setlocale livecd-net-eth livecd-install-wmaker \
random rpcbind plymouth avahi-daemon \
_OFF = anacron blk-availability bridge clamd crond dhcpd dmeventd dnsmasq \
lvm2-lvmetad lvm2-monitor mdadm netfs o2cb ocfs2 openvpn postfix \
rawdevices slapd smartd sshd sysstat update_wms xinetd
# copy stage2 as live
# NB: starts to preconfigure but doesn't use/cleanup yet
use/live: use/stage2 sub/rootfs@live sub/stage2@live
use/live: use/stage2 sub/rootfs@live sub/stage2@live \
use/services use/deflogin/live
@$(call add_feature)
@$(call add,CLEANUP_PACKAGES,'installer*')
@$(call add,DEFAULT_SERVICES_ENABLE,$(_ON))
@$(call add,DEFAULT_SERVICES_DISABLE,$(_OFF))
@$(call add,CONTROL,rpcbind:local)
use/live/base: use/live use/syslinux/ui/menu
use/live/base: use/live use/net use/syslinux/ui/menu
@$(call add,LIVE_LISTS,$(call tags,base && (live || network)))
# rw slice, see http://www.altlinux.org/make-initrd-propagator and #28289
@@ -18,16 +32,17 @@ use/live/rw: use/live; @:
endif
# graphical target (not enforcing xorg drivers or blobs)
use/live/x11: use/live/base use/x11-autologin use/sound +power +efi
use/live/x11: use/live/base use/syslinux/localboot.cfg \
use/deflogin/desktop use/x11-autologin use/sound \
use/fonts/otf/adobe use/fonts/otf/mozilla +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)
@$(call add,LIVE_PACKAGES,pciutils)
@$(call add,SYSLINUX_CFG,localboot)
# this target specifically pulls free xorg drivers in (and a few more bits)
# this target specifically pulls free xorg drivers in (and a few more bits);
# a browser is requested too, the recommended one can be overridden downstream
use/live/desktop: use/live/x11 use/x11/xorg use/x11/wacom \
use/xdg-user-dirs/deep +vmguest; @:
use/l10n use/browser/firefox/live use/xdg-user-dirs/deep +vmguest; @:
# preconfigure apt for both live and installed-from-live systems
use/live/repo: use/live
@@ -45,7 +60,7 @@ use/live/install: use/metadata use/xdg-user-dirs use/syslinux/localboot.cfg
@$(call add,LIVE_PACKAGES,livecd-installer-features)
# text-based installation script
use/live/textinstall: use/syslinux/localboot.cfg
use/live/textinstall: use/syslinux/lateboot.cfg
@$(call add,LIVE_PACKAGES,live-install)
# a very simplistic one
@@ -63,6 +78,8 @@ use/live/nodm: use/live/.x11
use/live/hooks: use/live
@$(call add,LIVE_PACKAGES,livecd-run-hooks)
# a crude hack to make sure Russian is supported in a particular image
use/live/ru: use/live
@$(call add,LIVE_PACKAGES,livecd-ru)
# a crude hack to make sure Russian is the default in a particular image
use/live/ru: use/live use/l10n/default/ru_RU; @:
use/live/sound: use/live
@$(call add,LIVE_PACKAGES,amixer alsa-utils aplay udev-alsa)

View File

@@ -1,77 +0,0 @@
#!/bin/sh
# see also m-p-d::profiles/live/image-scripts.d/init3-services
[ -x /sbin/chkconfig -o -x /bin/systemctl ] || exit 0
switch() {
case "$2" in
on)
cc=on; sc=enable;;
off)
cc=off; sc=disable;;
esac
{
[ ! -x /bin/systemctl ] ||
/bin/systemctl --no-reload $sc $1.service
[ ! -x /sbin/chkconfig ] ||
/sbin/chkconfig $1 $cc
} 2>/dev/null
}
ENABLE="
dm
kdm
wdm
prefdm
alteratord
livecd-evms
livecd-fstab
livecd-hostname
livecd-save-nfs
livecd-setauth
livecd-setlocale
livecd-net-eth
livecd-install-wmaker
network
NetworkManager
connman
random
rpcbind
plymouth
avahi-daemon
cpufreq-simple
"
# NB: dnsmasq: https://bugzilla.altlinux.org/show_bug.cgi?id=18799
# NB: sshd might be needed for some particular cases
DISABLE="
anacron
blk-availability
bridge
clamd
crond
dhcpd
dmeventd
dnsmasq
lvm2-lvmetad
lvm2-monitor
mdadm
netfs
o2cb
ocfs2
openvpn
postfix
rawdevices
slapd
smartd
sshd
sysstat
update_wms
xinetd
"
for i in $ENABLE; do switch $i on; done
for i in $DISABLE; do switch $i off; done
:

View File

@@ -1,56 +0,0 @@
#!/bin/sh
# * reset password for root
# * add user `altlinux' (without password)
GRPLIST="users scanner audio radio proc cdrom cdwriter wheel fuse netadmin"
verbose()
{
if [ -n "$GLOBAL_VERBOSE" ]; then
echo "HOOK: 30-users: $@"
fi
}
add_user()
{
verbose "Add $1 user"
local groups=
for g in $GRPLIST; do
if groupmod $g 2>/dev/null; then
if [ -n "$groups" ]; then
groups="$groups,$g"
else
groups="$g"
fi
fi
done
useradd -p "" -G "$groups" "$1" ||:
# Workaround for ALT#13213
chown -R "$1:auth" "/etc/tcb/$1"
chown -R "$1:$1" /home/$1
if [ -n "$GLOBAL_CRYPT_HOMES" ]; then
verbose "Set password for user $1"
echo "$1" | passwd --stdin $1
fi
sudoers="/etc/sudoers"
if [ -w "$sudoers" ]; then
verbose "Add $1 to sudoers."
echo "$1 ALL=(root) NOPASSWD:ALL" >> "$sudoers"
else
verbose "Can't find writable $sudoers file."
fi
echo "Hello friend, say \`$1' to log in at \\l" >> /etc/issue
}
verbose "has started"
verbose "Clear password for root account"
usermod -p "" root
add_user altlinux
verbose "finished"

View File

@@ -1,66 +0,0 @@
#!/bin/sh
# Setup network settings
# 1. Init /etc/hosts with "127.0.0.1 localhost"
# 2. Set hostname, domainname
# 3. Set defaults for NetworkManager or
# attempt to autoconfigure eth0 by etcnet.
. shell-config
verbose()
{
if [ -n "$GLOBAL_VERBOSE" ]; then
echo "HOOK: 50-setup-network: $@"
fi
}
verbose "has started"
# At startup time hostname may be changed by live-hostname package.
HOSTNAME="localhost.localdomain"
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"
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
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 /lib/udev/write_net_rules ] &&
[ -x /sbin/dhcpcd -o -x /sbin/dhclient ]; then
verbose "configuring DHCP for eth0"
mkdir -p "$prefix"/eth0 && {
echo TYPE=eth
echo BOOTPROTO=dhcp
} > "$prefix"/eth0/options
else
verbose "NOT configuring eth0 for DHCP"
fi
fi
verbose "finished"

View File

@@ -3,5 +3,6 @@ LUKS_LISTS := $(call tags,security luks)
use/luks:
@$(call add_feature)
@$(call add,BASE_PACKAGES,make-initrd-luks)
@$(call add,THE_PACKAGES,alterator-luks)
@$(call add,THE_LISTS,$(LUKS_LISTS))
@$(call add,RESCUE_LISTS,$(LUKS_LISTS))

View File

@@ -0,0 +1,6 @@
Эта фича конфигурирует внедрение контрольной суммы в образ
инсталятора после его сборки с целью проверки целостности
на ранней стадии установки.
NB: прототип, для реального использования надо сделать
микрообраз на основе stage2.

View File

@@ -0,0 +1,3 @@
use/mediacheck: use/stage2 sub/stage2@mediacheck use/syslinux/mediacheck.cfg
@$(call add_feature)
@$(call add,POSTPROCESS_TARGETS,90mediacheck)

View File

@@ -1,4 +1,4 @@
CHROOT_PACKAGES += isomd5sum
postprocess-90isomd5sum:
postprocess-90mediacheck:
@implantisomd5 "$(IMAGEDIR)/$(IMAGE_OUTFILE)"

View File

@@ -0,0 +1,3 @@
#!/bin/sh
mv -f -- /etc/inittab.mediacheck /etc/inittab
:>/etc/rc.d/rc

View File

@@ -0,0 +1,11 @@
#!/bin/sh
# everything needed should have been done within initrd when this boots
list="$(rpm -qa apt diffutils libapt librpm* make rpm shadow-utils udev* vim*)"
[ -z "$list" ] || rpm -e --nodeps $list 2>/dev/null ||:
rm -rf /var/lib/apt /var/cache/apt /var/lib/rpm
rm -rf /lib/modules
rm -rf /usr/share
rm -rf /usr/lib*/{locale,perl*,python*,systemd,udev}
rm -rf /{etc,lib}/{firmware,udev}

View File

@@ -0,0 +1,8 @@
# stage2 mod: mediacheck single-purpose "live" image
IMAGE_PACKAGES = startup-mediacheck
MKI_PACK_RESULTS = squash:mediacheck
debug::
@echo "** mediacheck: IMAGE_PACKAGES: $(IMAGE_PACKAGES)"

View File

@@ -2,3 +2,5 @@ use/memtest: use/syslinux
@$(call add_feature)
@$(call add,SYSTEM_PACKAGES,memtest86+)
@$(call add,SYSLINUX_CFG,memtest)
# see also use/efi/memtest86

View File

@@ -1,3 +1,10 @@
Эта фича занимается метаданными в составе образов --
в первую очередь инсталяционных и пригодных к установке
"живых".
Обязательные к установке по умолчанию пакеты задаются переменными
SYSTEM_PACKAGES, COMMON_PACKAGES, BASE_PACKAGES, BASE_LISTS,
THE_PACKAGES, THE_LISTS и передаются инсталятору посредством
Metadata/pkg-groups.tar (файл .base).
См. тж. фичу main.

View File

@@ -3,28 +3,31 @@
# package lists are needed for installer and live-install images
METADIR := files/Metadata
# preparation targets of ../../build-distro/lib/build-distro.mk
# preparation targets of features.in/build-distro/lib/build-distro.mk
WHATEVER += metadata
# handle these too
DOT_BASE += $(BASE_PACKAGES_REGEXP)
# args: name, suffix, command
define dump-THEM
if [ -n "$($(1)_$(2))" ]; then echo -e "\n## $(1)_$(2)"; $(3) $($(1)_$(2)); fi;
# args: type, name
define dump
if [ -n "$($(2)_$(1))" ]; then \
echo -e "\n## $(2)_$(1)"; \
case "$(1)" in \
PACKAGES) echo "$($(2)_$(1))";; \
LISTS) cat $($(2)_$(1));; \
esac; \
fi;
endef
dump-PACKAGES = $(call dump-THEM,$(1),PACKAGES,echo)
dump-LISTS = $(call dump-THEM,$(1),LISTS,cat)
# BASE_PACKAGES, BASE_LISTS and whatever else goes into base install;
# thus construct requisite .base packagelist for alterator-pkg
metadata-.base:
@cd $(call list,/); \
{ \
echo "## generated by features.in/metadata/lib/50-metadata.mk"; \
$(foreach p,SYSTEM COMMON THE BASE,$(call dump-PACKAGES,$(p))) \
$(foreach l,THE BASE,$(call dump-LISTS,$(l))) \
echo "## generated by features.in/metadata/lib/50-metadata.mk";\
$(foreach p,SYSTEM COMMON THE BASE,$(call dump,PACKAGES,$(p))) \
$(foreach l,THE BASE,$(call dump,LISTS,$(l))) \
if [ -n "$(DOT_BASE)" ]; then \
echo -e "\n## DOT_BASE\n$(DOT_BASE)"; \
fi; \

View File

@@ -1 +1,10 @@
Эта фича позволяет задать конфигурацию Ethernet-интерфейсов.
udev-rule-generator-net штатно добавляется для обеспечения
предсказуемых имён вида eth0/eth1/... в силу того, что их
сломали в апстримном systemd-udevd; для генерируемых "на лету"
следует применять конфигурирование времени загрузки (NM, connman
либо пакет livecd-net-eth).
Обратите внимание: применение в инсталяторах требует задействования
как use/net-eth, так и use/stage2/net-eth; +net-eth "подберёт" оба.

View File

@@ -1,6 +1,12 @@
# NB: this is aimed at LiveCD/installer images
+net-eth: use/net-eth use/stage2/net-eth
# see also use/stage2/net-eth; do not depend on it though
# as stage2-less images need preconfigured networking too
use/net-eth: use/net
@$(call add_feature)
@$(call xport,NET_ETH)
@$(call add,BASE_PACKAGES,udev-rule-generator-net)
# typical boilerplate
use/net-eth/dhcp: use/net-eth use/net/dhcp

View File

@@ -19,8 +19,10 @@ IFACEDIR="/etc/net/ifaces"
write_iface() {
dir="$IFACEDIR/$iface"
mkdir -p "$dir"
append=
case "$proto" in
dhcp)
append="DHCP_TIMEOUT=3"
;;
static)
[ -n "$ipv4addr" ] || fatal "ipv4addr missing"
@@ -34,11 +36,11 @@ write_iface() {
esac
{
echo "TYPE=eth"
echo "DISABLED=no"
echo "BOOTPROTO=$proto"
echo "NM_CONTROLLED=$NMCTL"
echo "DISABLED=$NMCTL"
echo "#USE_IFPLUGD=yes"
[ -z "$append" ] || echo "$append"
} > "$dir/options"
}

View File

@@ -8,15 +8,19 @@ use/net: use/services
use/net/dhcp: use/net
@$(call add,THE_PACKAGES,dhcpcd)
# base service, no GUI
use/net/nm: use/net
@$(call add,THE_LISTS,$(call tags,desktop nm))
@$(call add,THE_LISTS,$(call tags,base nm))
@$(call add,LIVE_PACKAGES,livecd-save-nfs)
@$(call add,DEFAULT_SERVICES_ENABLE,NetworkManager ModemManager)
@$(call add,DEFAULT_SERVICES_ENABLE,livecd-save-nfs)
@$(call add,DEFAULT_SERVICES_ENABLE,livecd-save-nfs) # keep interface up
use/net/nm/nodelay: use/net/nm
@$(call add,DEFAULT_SERVICES_DISABLE,NetworkManager-wait-online)
use/net/nm/mmgui: use/net/nm
@$(call add,THE_PACKAGES,modem-manager-gui)
use/net/connman: use/net
@$(call add,THE_PACKAGES,connman)
@$(call add,DEFAULT_SERVICES_ENABLE,connman)
@$(call add,DEFAULT_SERVICES_ENABLE,connmand connman)

View File

@@ -0,0 +1,12 @@
#!/bin/sh
. shell-config
defcfg=/etc/net/ifaces/default/options-eth
if [ -x /usr/sbin/NetworkManager -o -x /usr/sbin/connmand ]; then
shell_config_set "$defcfg" NM_CONTROLLED yes
if [ -x /sbin/dhcpcd -o -x /sbin/dhclient ]; then
shell_config_set "$defcfg" BOOTPROTO dhcp
fi
fi

View File

@@ -0,0 +1,19 @@
#!/bin/sh
# offer some convenient servers for static configuration cases
if [ -d /etc/net/ifaces/lo ]; then
{
echo "# yandex"
echo "#nameserver 77.88.8.1"
echo "# google"
echo "#nameserver 8.8.8.8"
echo "# level3"
echo "#nameserver 4.2.2.1"
echo "#nameserver 4.2.2.2"
echo "#nameserver 4.2.2.3"
} >> /etc/net/ifaces/lo/resolv.conf
fi
find /var -name resolv.conf -or -name nsswitch.conf -delete
# hasher might have carried host /etc/hosts over, need to overwrite
echo "127.0.0.1 localhost.localdomain localhost" > /etc/hosts

Some files were not shown because too many files have changed in this diff Show More