stepchenkoas/mkimage-profiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

repo: rename variable ROOTFS_MAIN to REPO_MAIN

Browse Source 
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.
This commit is contained in:
Anton Midyukov 2022-02-02 15:27:09 +07:00
parent 3a3ebe0b73
commit 3dfe3f9328
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
features.in/repo/config.mk
View File

@ -1,15 +1,15 @@
use/repo:
@$(call add_feature)
@$(call add,STAGE1_PACKAGES,gnupg)
@$(call try,REPO,rsync/alt)
@$(call xport,ROOTFS_MAIN)
@$(call try,REPO,http/alt)
@$(call xport,REPO_MAIN)
@$(call xport,REPO)
use/repo/main:: sub/main use/repo; @:
ifeq (vm,$(IMAGE_CLASS))
use/repo/main::
@$(call set,ROOTFS_MAIN,1)
@$(call set,REPO_MAIN,1)
@$(call add,THE_PACKAGES,apt-repo-tools)
endif

2
features.in/repo/image-scripts.d/90-enable-repo
View File

@ -1,7 +1,7 @@
#!/bin/sh
# 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

2
features.in/repo/rootfs/image-scripts.d/01-genbasedir-rootfs
View File

@ -1,6 +1,6 @@
#!/bin/sh -eu
[ -n "$GLOBAL_ROOTFS_MAIN" ] || exit 0
[ -n "$GLOBAL_REPO_MAIN" ] || exit 0
mv /ALTLinux /srv/ALT

2
features.in/repo/rootfs/image-scripts.d/80-repo-rootfs-main
View File

@ -2,7 +2,7 @@
# configure package repository of the image (provided by sub/main);
# 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