Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
Obarun Install
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Eric Vidal
Obarun Install
Commits
9efae8d2
Commit
9efae8d2
authored
4 years ago
by
Eric Vidal
Browse files
Options
Downloads
Patches
Plain Diff
do not synchronize at glibc update, reorganize order of function call
parent
1f5ff462
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
obarun-install.in
+13
-7
13 additions, 7 deletions
obarun-install.in
with
13 additions
and
7 deletions
obarun-install.in
+
13
−
7
View file @
9efae8d2
...
...
@@ -104,12 +104,12 @@ check_database(){
fi
}
check_
pacman_
keyring
(){
check_keyring
(){
# always udpate the host keyring
pacman
-S
archlinux-keyring
--noconfirm
--needed
||
die
"unable to update pacman-keyring"
"clean_install"
pacman
-S
archlinux-keyring
obarun-keyring
--noconfirm
--needed
||
die
"unable to update pacman-keyring"
"clean_install"
}
hot_fix
()
check_glibc_ver
()
{
if
[[
-d
/run/archiso/sfs/airootfs/
]]
;
then
run_cmd check_gpg
"
${
GPG_DIR
}
"
...
...
@@ -117,7 +117,7 @@ hot_fix()
local
=
$(
expac
-Q
%v glibc
--config
"
$GENERAL_DIR
/
$CONFIG_DIR
/pacman.conf"
)
if
vercmp
${
remote
}
${
local
}
>
&/dev/null
;
then
oblog
-t
"Updating glibc package"
pacman
-S
y
glibc
--noconfirm
--config
"
$GENERAL_DIR
/
$CONFIG_DIR
/pacman.conf"
pacman
-S
glibc
--noconfirm
--config
"
$GENERAL_DIR
/
$CONFIG_DIR
/pacman.conf"
fi
fi
}
...
...
@@ -136,13 +136,19 @@ if [[ "$NETWORKCHECK" == "yes" ]]; then
check_network
run_cmd
sed
-i
"s,^NETWORKCHECK=.*
$,
NETWORKCHECK=
\"
no
\"
,"
"
${
CONFIG
}
"
fi
check_database
hot_fix
main_update
check_pacman_keyring
check_database
check_glibc_ver
check_keyring
dg_info
"Welcome to the obarun installer"
"
$dgm_welcome
"
if
[[
"
$KEYBOARDCHECK
"
==
"yes"
]]
;
then
set_keymap
run_cmd
sed
-i
"s,^KEYBOARDCHECK=.*
$,
KEYBOARDCHECK=
\"
no
\"
,"
"
${
CONFIG
}
"
fi
main_menu
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment