Skip to content

Commit a6b5f54

Browse files
committed
Fix to use group id to support changes in DNF 5 #117
1 parent 3632165 commit a6b5f54

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

virtualmin-install.sh

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -437,54 +437,63 @@ fi
437437

438438
# Virtualmin-provided packages
439439
vmgroup="'Virtualmin Core'"
440+
vmgroupid="virtualmincore"
440441
vmgrouptext="Virtualmin $vm_version provided packages"
441442
debvmpackages="virtualmin-core"
442443
deps=
443444

444445
if [ "$mode" = 'full' ]; then
445446
if [ "$bundle" = 'LAMP' ]; then
446447
rhgroup="'Virtualmin LAMP Stack'"
448+
rhgroupid="virtualmin-lamp"
447449
rhgrouptext="Virtualmin $vm_version LAMP stack"
448450
debdeps="virtualmin-lamp-stack"
449451
ubudeps="virtualmin-lamp-stack"
450452
elif [ "$bundle" = 'LEMP' ]; then
451453
rhgroup="'Virtualmin LEMP Stack'"
454+
rhgroupid="virtualmin-lemp"
452455
rhgrouptext="Virtualmin $vm_version LEMP stack"
453456
debdeps="virtualmin-lemp-stack"
454457
ubudeps="virtualmin-lemp-stack"
455458
fi
456459
elif [ "$mode" = 'mini' ]; then
457460
if [ "$bundle" = 'LAMP' ]; then
458461
rhgroup="'Virtualmin LAMP Stack Minimal'"
462+
rhgroupid="virtualmin-lamp-minimal"
459463
rhgrouptext="Virtualmin $vm_version LAMP stack mini"
460464
debdeps="virtualmin-lamp-stack-minimal"
461465
ubudeps="virtualmin-lamp-stack-minimal"
462466
elif [ "$bundle" = 'LEMP' ]; then
463467
rhgroup="'Virtualmin LEMP Stack Minimal'"
468+
rhgroupid="virtualmin-lemp-minimal"
464469
rhgrouptext="Virtualmin $vm_version LEMP stack mini'"
465470
debdeps="virtualmin-lemp-stack-minimal"
466471
ubudeps="virtualmin-lemp-stack-minimal"
467472
fi
468473
elif [ "$mode" = 'micro' ]; then
469474
if [ "$bundle" = 'LAMP' ]; then
470475
rhgroup="'Virtualmin LAMP Stack Micro'"
476+
rhgroupid="virtualmin-lamp-micro"
471477
rhgrouptext="Virtualmin $vm_version LAMP stack micro"
472478
debdeps="virtualmin-lamp-stack-micro"
473479
ubudeps="virtualmin-lamp-stack-micro"
474480
elif [ "$bundle" = 'LEMP' ]; then
475481
rhgroup="'Virtualmin LEMP Stack Micro'"
482+
rhgroupid="virtualmin-lemp-micro"
476483
rhgrouptext="Virtualmin $vm_version LEMP stack micro"
477484
debdeps="virtualmin-lemp-stack-micro"
478485
ubudeps="virtualmin-lemp-stack-micro"
479486
fi
480487
elif [ "$mode" = 'nano' ]; then
481488
if [ "$bundle" = 'LAMP' ]; then
482489
rhgroup="'Virtualmin LAMP Stack Nano'"
490+
rhgroupid="virtualmin-lamp-nano"
483491
rhgrouptext="Virtualmin $vm_version LAMP stack nano"
484492
debdeps="virtualmin-lamp-stack-nano"
485493
ubudeps="virtualmin-lamp-stack-nano"
486494
elif [ "$bundle" = 'LEMP' ]; then
487495
rhgroup="'Virtualmin LEMP Stack Nano'"
496+
rhgroupid="virtualmin-lemp-nano"
488497
rhgrouptext="Virtualmin $vm_version LEMP stack nano"
489498
debdeps="virtualmin-lemp-stack-nano"
490499
ubudeps="virtualmin-lemp-stack-nano"
@@ -1782,8 +1791,8 @@ install_with_yum() {
17821791
fi
17831792

17841793
# Install core and stack
1785-
run_ok "$install_group $rhgroup" "Installing dependencies and system packages"
1786-
run_ok "$install_group $vmgroup" "Installing Virtualmin $vm_version and all related packages"
1794+
run_ok "$install_group $rhgroupid" "Installing dependencies and system packages"
1795+
run_ok "$install_group $vmgroupid" "Installing Virtualmin $vm_version and all related packages"
17871796
rs=$?
17881797
if [ $? -ne 0 ]; then
17891798
fatal "Installation failed: $rs"

0 commit comments

Comments
 (0)