Commit 3dfe3f93 authored by Anton Midyukov's avatar Anton Midyukov

repo: rename variable ROOTFS_MAIN to REPO_MAIN

This variable blocks the enable of online repositories and activates the enable of RPMS.main repository in iso or rootfs. The old name was misleading.
parent 3a3ebe0b
use/repo: use/repo:
@$(call add_feature) @$(call add_feature)
@$(call add,STAGE1_PACKAGES,gnupg) @$(call add,STAGE1_PACKAGES,gnupg)
@$(call try,REPO,rsync/alt) @$(call try,REPO,http/alt)
@$(call xport,ROOTFS_MAIN) @$(call xport,REPO_MAIN)
@$(call xport,REPO) @$(call xport,REPO)
use/repo/main:: sub/main use/repo; @: use/repo/main:: sub/main use/repo; @:
ifeq (vm,$(IMAGE_CLASS)) ifeq (vm,$(IMAGE_CLASS))
use/repo/main:: use/repo/main::
@$(call set,ROOTFS_MAIN,1) @$(call set,REPO_MAIN,1)
@$(call add,THE_PACKAGES,apt-repo-tools) @$(call add,THE_PACKAGES,apt-repo-tools)
endif endif
......
#!/bin/sh #!/bin/sh
# enable online repos if not use/repo/main # enable online repos if not use/repo/main
[ -z "$GLOBAL_ROOTFS_MAIN" ] || exit 0 [ -z "$GLOBAL_REPO_MAIN" ] || exit 0
[ -n "$GLOBAL_REPO" ] || exit 0 [ -n "$GLOBAL_REPO" ] || exit 0
......
#!/bin/sh -eu #!/bin/sh -eu
[ -n "$GLOBAL_ROOTFS_MAIN" ] || exit 0 [ -n "$GLOBAL_REPO_MAIN" ] || exit 0
mv /ALTLinux /srv/ALT mv /ALTLinux /srv/ALT
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# configure package repository of the image (provided by sub/main); # configure package repository of the image (provided by sub/main);
# this script will be run iff both live and repo features are used # this script will be run iff both live and repo features are used
[ -n "$GLOBAL_ROOTFS_MAIN" ] || exit 0 [ -n "$GLOBAL_REPO_MAIN" ] || exit 0
DIR=/etc/apt/sources.list.d DIR=/etc/apt/sources.list.d
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment