parent
22f7f75d8d
commit
d7dffd7a5f
File diff suppressed because it is too large
Load Diff
@ -1 +1 @@ |
|||||||
e8f8a56263ae690a4325e4fbdef5cabb111406e0 |
e1b6e10bac7b540f29a965935d4ada6b82740763 |
||||||
|
|||||||
@ -1 +1 @@ |
|||||||
20211227 |
20220209 |
||||||
|
|||||||
@ -1 +1 @@ |
|||||||
KOMETA kometa-school-p10/x86_64 build 2021-12-27 |
KOMETA p10 kde5/x86_64 build 2022-02-09 |
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@ -0,0 +1,18 @@ |
|||||||
|
#!/bin/sh |
||||||
|
# setup serial console access |
||||||
|
|
||||||
|
BIN=/sbin/agetty |
||||||
|
CFG=/etc/inittab |
||||||
|
SEC=/etc/securetty |
||||||
|
|
||||||
|
[ -n "$GLOBAL_TTY_DEV" -a -n "$GLOBAL_TTY_RATE" ] || exit 0 |
||||||
|
[ -s "$CFG" -a -x "$BIN" ] || exit 0 |
||||||
|
|
||||||
|
if ! grep -q "$BIN" "$CFG"; then |
||||||
|
n=0 |
||||||
|
for t in $GLOBAL_TTY_DEV; do |
||||||
|
grep -q "$t" "$SEC" || echo "$t" >>"$SEC" |
||||||
|
echo "T$n:2345:respawn:$BIN -L $t $GLOBAL_TTY_RATE vt100" >>$CFG |
||||||
|
n=$(($n+1)) |
||||||
|
done |
||||||
|
fi |
||||||
@ -0,0 +1,3 @@ |
|||||||
|
#!/bin/sh |
||||||
|
|
||||||
|
rm -f /.image/.empty |
||||||
@ -1,10 +1,4 @@ |
|||||||
xorg-drv-ati |
|
||||||
xorg-drv-cirrus |
xorg-drv-cirrus |
||||||
#xorg-drv-mga |
xorg-drv-mga |
||||||
xorg-drv-modesetting |
|
||||||
#xorg-drv-nv |
|
||||||
xorg-drv-qxl |
xorg-drv-qxl |
||||||
#xorg-drv-s3 |
xorg-drv-spiceqxl |
||||||
#xorg-drv-s3virge |
|
||||||
#xorg-drv-savage |
|
||||||
#xorg-drv-sis |
|
||||||
|
|||||||
@ -0,0 +1,18 @@ |
|||||||
|
#!/bin/sh |
||||||
|
# setup serial console access |
||||||
|
|
||||||
|
BIN=/sbin/agetty |
||||||
|
CFG=/etc/inittab |
||||||
|
SEC=/etc/securetty |
||||||
|
|
||||||
|
[ -n "$GLOBAL_TTY_DEV" -a -n "$GLOBAL_TTY_RATE" ] || exit 0 |
||||||
|
[ -s "$CFG" -a -x "$BIN" ] || exit 0 |
||||||
|
|
||||||
|
if ! grep -q "$BIN" "$CFG"; then |
||||||
|
n=0 |
||||||
|
for t in $GLOBAL_TTY_DEV; do |
||||||
|
grep -q "$t" "$SEC" || echo "$t" >>"$SEC" |
||||||
|
echo "T$n:2345:respawn:$BIN -L $t $GLOBAL_TTY_RATE vt100" >>$CFG |
||||||
|
n=$(($n+1)) |
||||||
|
done |
||||||
|
fi |
||||||
@ -1,4 +1,4 @@ |
|||||||
#!/bin/sh |
#!/bin/sh |
||||||
# TODO: invent some way to remove this inter-subprofile thing |
# TODO: invent some way to remove this inter-subprofile thing |
||||||
|
|
||||||
rm -vf $WORKDIR/{squashcfg.mk,initfs,.gitignore} |
rm -vf $WORKDIR/{squashcfg.mk,initfs,.gitignore,.empty} |
||||||
|
|||||||
@ -1,7 +1,7 @@ |
|||||||
menuentry $"LiveCD with sessions support" --id 'session' { |
menuentry $"LiveCD with sessions support" --id 'session' { |
||||||
savedefault |
savedefault |
||||||
echo $"Loading Linux vmlinuz$KFLAVOUR ..." |
echo $"Loading Linux vmlinuz$KFLAVOUR ..." |
||||||
linux$linux_suffix /boot/vmlinuz$KFLAVOUR fastboot live changedisk automatic=method:cdrom,fuid:2021-12-09-16-40-50-00 stagename=live ramdisk_size=@live_size@ showopts live_rw vga=normal usbcore.autosuspend=-1 quiet splash $EFI_BOOTARGS lang=$lang |
linux$linux_suffix /boot/vmlinuz$KFLAVOUR fastboot live changedisk automatic=method:cdrom,fuid:2022-02-08-19-50-45-00 stagename=live ramdisk_size=@live_size@ showopts live_rw vga=normal usbcore.autosuspend=-1 quiet splash $EFI_BOOTARGS lang=$lang |
||||||
echo $"Loading initial ramdisk ..." |
echo $"Loading initial ramdisk ..." |
||||||
initrd$linux_suffix /boot/full$KFLAVOUR.cz |
initrd$linux_suffix /boot/full$KFLAVOUR.cz |
||||||
} |
} |
||||||
|
|||||||
@ -1,10 +1,10 @@ |
|||||||
<html> |
<html> |
||||||
<head> |
<head> |
||||||
<meta http-equiv="refresh" content="3;url=http://altlinux.org/"> |
<meta http-equiv="refresh" content="3;url=http://oskometa.ru/"> |
||||||
<title>Welcome to ALT!</title> |
<title>Welcome to KOMETA!</title> |
||||||
</head> |
</head> |
||||||
<body> |
<body> |
||||||
<h1>Welcome to ALT!</h1> |
<h1>Welcome to KOMETA!</h1> |
||||||
<p>You will be redirected to <a href="http://altlinux.org/">the home page</a> shortly.</p> |
<p>You will be redirected to <a href="http://oskometa.ru/">the home page</a> shortly.</p> |
||||||
</body> |
</body> |
||||||
</html> |
</html> |
||||||
|
|||||||
@ -1,4 +1,4 @@ |
|||||||
label live |
label live |
||||||
kernel /boot/vmlinuz |
kernel /boot/vmlinuz |
||||||
append initrd=/boot/full.cz fastboot live changedisk automatic=method:cdrom,fuid:2021-12-09-16-40-50-00 stagename=live ramdisk_size=@live_size@ showopts lowmem vga=normal usbcore.autosuspend=-1 quiet splash |
append initrd=/boot/full.cz fastboot live changedisk automatic=method:cdrom,fuid:2022-02-08-19-50-45-00 stagename=live ramdisk_size=@live_size@ showopts lowmem vga=normal usbcore.autosuspend=-1 quiet splash |
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@ |
|||||||
label session |
label session |
||||||
kernel /boot/vmlinuz |
kernel /boot/vmlinuz |
||||||
append initrd=/boot/full.cz fastboot live changedisk automatic=method:cdrom,fuid:2021-12-09-16-40-50-00 stagename=live ramdisk_size=@live_size@ showopts live_rw vga=normal usbcore.autosuspend=-1 quiet splash |
append initrd=/boot/full.cz fastboot live changedisk automatic=method:cdrom,fuid:2022-02-08-19-50-45-00 stagename=live ramdisk_size=@live_size@ showopts live_rw vga=normal usbcore.autosuspend=-1 quiet splash |
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,12 @@ |
|||||||
# vmguest |
# vmguest |
||||||
kernel/drivers/virtio |
kernel/drivers/virtio |
||||||
vmxnet3.ko |
vmxnet3.ko |
||||||
hv_netvsc.ko |
|
||||||
virtio_net.ko |
virtio_net.ko |
||||||
# |
|
||||||
|
# hyper-v |
||||||
|
hv_balloon.ko |
||||||
|
hv_netvsc.ko |
||||||
|
hv_sock.ko |
||||||
|
hv_storvsc.ko |
||||||
|
hv_vmbus.ko |
||||||
|
uio_hv_generic.ko |
||||||
|
|||||||
@ -0,0 +1,3 @@ |
|||||||
|
#!/bin/sh |
||||||
|
|
||||||
|
rm -f /.image/.empty |
||||||
@ -1,4 +1,4 @@ |
|||||||
#!/bin/sh |
#!/bin/sh |
||||||
# TODO: invent some way to remove this inter-subprofile thing |
# TODO: invent some way to remove this inter-subprofile thing |
||||||
|
|
||||||
rm -vf $WORKDIR/{squashcfg.mk,initfs,.gitignore} |
rm -vf $WORKDIR/{squashcfg.mk,initfs,.gitignore,.empty} |
||||||
|
|||||||
@ -0,0 +1,14 @@ |
|||||||
|
#!/bin/sh -efu |
||||||
|
|
||||||
|
GRUB_CFG=/etc/sysconfig/grub2 |
||||||
|
|
||||||
|
[ -s "$GRUB_CFG" ] || exit 0 |
||||||
|
|
||||||
|
GRUBTHEME="$(cat "$GRUB_CFG" |grep '^GRUB_THEME=.*' |tail -n 1)" |
||||||
|
GRUBTHEME="${GRUBTHEME%/*}" |
||||||
|
GRUBTHEME="${GRUBTHEME##*/}" |
||||||
|
|
||||||
|
[ -z "$GRUBTHEME" ] || exit 0 |
||||||
|
|
||||||
|
sed '/^GRUB_TERMINAL_OUTPUT=.*/d' -i "$GRUB_CFG" |
||||||
|
echo 'GRUB_TERMINAL_OUTPUT="console"' >> "$GRUB_CFG" |
||||||
@ -0,0 +1,13 @@ |
|||||||
|
This feature installs gitlab-runner according official guide [1] |
||||||
|
|
||||||
|
The following envs can be altered: |
||||||
|
|
||||||
|
GL_USER - define default gitlab-runner username ('gitlab-runner' by default) |
||||||
|
GL_SSH_KEY - ssh pubkey added to authorized_keys of GL_USER |
||||||
|
|
||||||
|
NOTE: this feature depends on network enablement in hasher (see [2] for details) |
||||||
|
and mkimage [3] |
||||||
|
|
||||||
|
1. https://docs.gitlab.com/runner/install/linux-manually.html |
||||||
|
2. https://bugzilla.altlinux.org/34596 |
||||||
|
3. https://git.altlinux.org/people/legion/packages/mkimage.git?p=mkimage.git;a=commitdiff;h=6e90f032f15f89de1c2c523a725e369ab6cad1a0 |
||||||
@ -0,0 +1,13 @@ |
|||||||
|
# WARNING: the variable values are stored in build config/log!
|
||||||
|
use/gitlab-runner: |
||||||
|
@$(call add_feature)
|
||||||
|
@$(call add,THE_PACKAGES,shadow-utils passwd curl)
|
||||||
|
@$(call xport,GL_USER)
|
||||||
|
@$(call xport,GL_SSH_KEY)
|
||||||
|
|
||||||
|
# some presets
|
||||||
|
# USERS variable chunk format is "login:passwd:admin:sudo"
|
||||||
|
# GROUPS are just stashed there to include USERS logins created
|
||||||
|
# GL_SSH_KEY should be changed accordingly
|
||||||
|
use/gitlab-runner/defuser: use/gitlab-runner |
||||||
|
@$(call add,GL_USER,gitlab-runner)
|
||||||
@ -0,0 +1,61 @@ |
|||||||
|
#!/bin/sh -efu |
||||||
|
|
||||||
|
gl_url="https://gitlab-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-runner-linux-" |
||||||
|
|
||||||
|
add_user() { |
||||||
|
useradd -c 'Gitlab Runner' -m "$1" |
||||||
|
[ -z "$GLOBAL_GL_SSH_KEY" ] || echo "$GLOBAL_GL_SSH_KEY" >> /home/"$1"/.ssh/authorized_keys |
||||||
|
usermod -L "$1" || |
||||||
|
echo "*** failed to add user '$1'" |
||||||
|
} |
||||||
|
|
||||||
|
|
||||||
|
case "$GLOBAL_ARCH" in |
||||||
|
x86_64) |
||||||
|
gl_url="${gl_url}amd64" |
||||||
|
;; |
||||||
|
i586) |
||||||
|
gl_url="${gl_url}386" |
||||||
|
;; |
||||||
|
armh) |
||||||
|
gl_url="${gl_url}arm" |
||||||
|
;; |
||||||
|
aarch64) |
||||||
|
gl_url="${gl_url}arm64" |
||||||
|
;; |
||||||
|
ppc64le) |
||||||
|
gl_url="${gl_url}ppc64le" |
||||||
|
;; |
||||||
|
*) |
||||||
|
echo "arch $GLOBAL_ARCH not supported!" |
||||||
|
exit 1 |
||||||
|
;; |
||||||
|
esac |
||||||
|
|
||||||
|
if [ -n "$GLOBAL_GL_USER" ]; then |
||||||
|
add_user "$GLOBAL_GL_USER" |
||||||
|
echo 'nameserver 8.8.8.8' >> /etc/resolv.conf |
||||||
|
curl -L --output /usr/local/bin/gitlab-runner "$gl_url" |
||||||
|
chmod +x /usr/local/bin/gitlab-runner |
||||||
|
cat > /lib/systemd/system/gitlab-runner.service << EOF |
||||||
|
[Unit] |
||||||
|
Description=GitLab Runner |
||||||
|
ConditionFileIsExecutable=/usr/local/bin/gitlab-runner |
||||||
|
|
||||||
|
After=syslog.target network.target |
||||||
|
|
||||||
|
[Service] |
||||||
|
StartLimitInterval=5 |
||||||
|
StartLimitBurst=10 |
||||||
|
ExecStart=/usr/bin/gitlab-runner "run" "--working-directory" "/home/$GLOBAL_GL_USER" "--config" "/etc/gitlab-runner/config.toml" "--service" "gitlab-runner" "--user" "$GLOBAL_GL_USER" |
||||||
|
|
||||||
|
Restart=always |
||||||
|
|
||||||
|
RestartSec=120 |
||||||
|
EnvironmentFile=-/etc/sysconfig/gitlab-runner |
||||||
|
|
||||||
|
[Install] |
||||||
|
WantedBy=multi-user.target |
||||||
|
EOF |
||||||
|
systemctl enable gitlab-runner |
||||||
|
fi |
||||||
@ -1,5 +1,5 @@ |
|||||||
#!/bin/sh -e |
#!/bin/sh -e |
||||||
|
|
||||||
useradd kometa |
useradd kometa |
||||||
echo 'kometa ALL=NOPASSWD:ALL' > /etc/sudo.d/kometa |
echo 'altlinux ALL=NOPASSWD:ALL' > /etc/sudo.d/kometa |
||||||
chmod 400 /etc/sudo.d/kometa |
chmod 400 /etc/sudo.d/kometa |
||||||
|
|||||||
@ -1,15 +1,42 @@ |
|||||||
#!/bin/sh |
#!/bin/sh |
||||||
# enable online repos if possible, just quit if list is absent |
# enable online repos if not use/repo/main |
||||||
|
|
||||||
repo_source='/etc/apt/sources.list.d/yandex.list' |
[ -z "$GLOBAL_REPO_MAIN" ] || exit 0 |
||||||
|
|
||||||
[ -z "$GLOBAL_ROOTFS_MAIN" ] || exit 0 |
# no public repos for e2k for now, unfortunately |
||||||
|
[ `arch` != "e2k" ] || exit 0 |
||||||
|
|
||||||
[ -s "$repo_source" ] || exit 0 |
[ -n "$GLOBAL_REPO" ] || exit 0 |
||||||
|
|
||||||
|
PROTO="${GLOBAL_REPO%/*}" # http, ftp, rsync |
||||||
|
case "$PROTO" in |
||||||
|
http|ftp|rsync) |
||||||
|
;; |
||||||
|
*) |
||||||
|
echo "Error: protocol $PROTO not supported" >&2 |
||||||
|
exit 1 |
||||||
|
;; |
||||||
|
esac |
||||||
|
|
||||||
|
MIRROR="${GLOBAL_REPO#*/}" # alt, heanet, kiev, yandex, ... |
||||||
|
|
||||||
|
if [ -z "$MIRROR" ]; then |
||||||
|
echo "Error: variable MIRROR is not set!!!" >&2 |
||||||
|
echo "Set REPO variable in the format: PROTO/MIRROR" >&2 |
||||||
|
echo "Example: http/yandex" >&2 |
||||||
|
exit 1 |
||||||
|
fi |
||||||
|
|
||||||
|
repo_source="/etc/apt/sources.list.d/$MIRROR.list" |
||||||
|
|
||||||
|
if [ ! -s "$repo_source" ]; then |
||||||
|
echo "Error: $repo_source is not exist" >&2 |
||||||
|
exit 1 |
||||||
|
fi |
||||||
|
|
||||||
# regexps from alterator-pkg (via installer-feature-online-repo) |
# regexps from alterator-pkg (via installer-feature-online-repo) |
||||||
prefix_re="[[:space:]]*rpm[[:space:]]\+\([^[:space:]]\+[[:space:]]\+\)\?" |
prefix_re="[[:space:]]*rpm[[:space:]]\+\([^[:space:]]\+[[:space:]]\+\)\?" |
||||||
host_re="http:\/\/\([^[:space:]]\+\)[[:space:]]\+" |
host_re="${PROTO:-http}:\/\/\([^[:space:]]\+\)[[:space:]]\+" |
||||||
updates_re="${prefix_re}${host_re}\([^[:space:]]\+\/\)\?" |
updates_re="${prefix_re}${host_re}\([^[:space:]]\+\/\)\?" |
||||||
|
|
||||||
sed -i "s/^#\($updates_re\)/\1/" "$repo_source" |
sed -i "s/^#\($updates_re\)/\1/" "$repo_source" |
||||||
|
|||||||
@ -0,0 +1,17 @@ |
|||||||
|
#!/bin/sh |
||||||
|
|
||||||
|
repo_script=/usr/share/install2/postinstall.d/99-online-repo.sh |
||||||
|
|
||||||
|
[ -f "$repo_script" ] || exit 0 |
||||||
|
[ -n "$GLOBAL_REPO" ] || exit 0 |
||||||
|
|
||||||
|
MIRROR="${GLOBAL_REPO#*/}" # alt, heanet, kiev, yandex, ... |
||||||
|
|
||||||
|
repo_source="/etc/apt/sources.list.d/$MIRROR.list" |
||||||
|
|
||||||
|
if [ ! -s "$repo_source" ]; then |
||||||
|
echo "Error: $repo_source is not exist" >&2 |
||||||
|
exit 1 |
||||||
|
fi |
||||||
|
|
||||||
|
sed -i "s;repo_source=.*;repo_source=$repo_source;" "$repo_script" |
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue